CCF_100
/
yuzu-mirror
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Merge pull request #3323 from ReinUsesLisp/fix-template-res 

gl_state: Use bool instead of GLboolean
master
bunnei 2020-01-18 17:37:05 +07:00 committed by GitHub
parent e972016456 d110a371bb
commit 94c41ab1d1
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/video_core/renderer_opengl/gl_rasterizer.cpp
Unescape Escape View File

@ -1272,7 +1272,7 @@ void RasterizerOpenGL::SyncPointState() {
const auto& regs = system.GPU().Maxwell3D().regs; const auto& regs = system.GPU().Maxwell3D().regs;
// Limit the point size to 1 since nouveau sometimes sets a point size of 0 (and that's invalid // Limit the point size to 1 since nouveau sometimes sets a point size of 0 (and that's invalid
// in OpenGL). // in OpenGL).
state.point.program_control = regs.vp_point_size.enable ? GL_TRUE : GL_FALSE; state.point.program_control = regs.vp_point_size.enable != 0;
state.point.size = std::max(1.0f, regs.point_size); state.point.size = std::max(1.0f, regs.point_size);
} }

4
src/video_core/renderer_opengl/gl_state.h
Unescape Escape View File

@ -131,8 +131,8 @@ public:
std::array<Viewport, Tegra::Engines::Maxwell3D::Regs::NumViewports> viewports; std::array<Viewport, Tegra::Engines::Maxwell3D::Regs::NumViewports> viewports;
struct { struct {
GLboolean program_control = GL_FALSE; // GL_PROGRAM_POINT_SIZE bool program_control = false; // GL_PROGRAM_POINT_SIZE
GLfloat size = 1.0f; // GL_POINT_SIZE GLfloat size = 1.0f; // GL_POINT_SIZE
} point; } point;
struct { struct {