diff options
| author | 2020-01-18 17:37:05 -0500 | |
|---|---|---|
| committer | 2020-01-18 17:37:05 -0500 | |
| commit | 94c41ab1d1ab026ec382473dc18b3c5b3314cf7f (patch) | |
| tree | 0eb0656b616840d9cf55b7d35e991035135afd6a /src | |
| parent | Merge pull request #3298 from Simek/missing_hotkeys (diff) | |
| parent | gl_state: Use bool instead of GLboolean (diff) | |
| download | yuzu-94c41ab1d1ab026ec382473dc18b3c5b3314cf7f.tar.gz yuzu-94c41ab1d1ab026ec382473dc18b3c5b3314cf7f.tar.xz yuzu-94c41ab1d1ab026ec382473dc18b3c5b3314cf7f.zip | |
Merge pull request #3323 from ReinUsesLisp/fix-template-res
gl_state: Use bool instead of GLboolean
Diffstat (limited to 'src')
| -rw-r--r-- | src/video_core/renderer_opengl/gl_rasterizer.cpp | 2 | ||||
| -rw-r--r-- | src/video_core/renderer_opengl/gl_state.h | 4 |
2 files changed, 3 insertions, 3 deletions
diff --git a/src/video_core/renderer_opengl/gl_rasterizer.cpp b/src/video_core/renderer_opengl/gl_rasterizer.cpp index 926bccd42..c428f06e4 100644 --- a/src/video_core/renderer_opengl/gl_rasterizer.cpp +++ b/src/video_core/renderer_opengl/gl_rasterizer.cpp | |||
| @@ -1272,7 +1272,7 @@ void RasterizerOpenGL::SyncPointState() { | |||
| 1272 | const auto& regs = system.GPU().Maxwell3D().regs; | 1272 | const auto& regs = system.GPU().Maxwell3D().regs; |
| 1273 | // Limit the point size to 1 since nouveau sometimes sets a point size of 0 (and that's invalid | 1273 | // Limit the point size to 1 since nouveau sometimes sets a point size of 0 (and that's invalid |
| 1274 | // in OpenGL). | 1274 | // in OpenGL). |
| 1275 | state.point.program_control = regs.vp_point_size.enable ? GL_TRUE : GL_FALSE; | 1275 | state.point.program_control = regs.vp_point_size.enable != 0; |
| 1276 | state.point.size = std::max(1.0f, regs.point_size); | 1276 | state.point.size = std::max(1.0f, regs.point_size); |
| 1277 | } | 1277 | } |
| 1278 | 1278 | ||
diff --git a/src/video_core/renderer_opengl/gl_state.h b/src/video_core/renderer_opengl/gl_state.h index 71d418776..678e5cd89 100644 --- a/src/video_core/renderer_opengl/gl_state.h +++ b/src/video_core/renderer_opengl/gl_state.h | |||
| @@ -131,8 +131,8 @@ public: | |||
| 131 | std::array<Viewport, Tegra::Engines::Maxwell3D::Regs::NumViewports> viewports; | 131 | std::array<Viewport, Tegra::Engines::Maxwell3D::Regs::NumViewports> viewports; |
| 132 | 132 | ||
| 133 | struct { | 133 | struct { |
| 134 | GLboolean program_control = GL_FALSE; // GL_PROGRAM_POINT_SIZE | 134 | bool program_control = false; // GL_PROGRAM_POINT_SIZE |
| 135 | GLfloat size = 1.0f; // GL_POINT_SIZE | 135 | GLfloat size = 1.0f; // GL_POINT_SIZE |
| 136 | } point; | 136 | } point; |
| 137 | 137 | ||
| 138 | struct { | 138 | struct { |