diff options
| author | 2018-07-21 10:54:58 -0700 | |
|---|---|---|
| committer | 2018-07-21 10:54:58 -0700 | |
| commit | ff8754f921a0e9f1c7da02b768fad5584d3d22c5 (patch) | |
| tree | 0b8b2a30fcc73468437c5c557379892748a0498b /src | |
| parent | Merge pull request #755 from lioncash/ctor (diff) | |
| parent | gl_shader_manager: Replace unimplemented function prototype (diff) | |
| download | yuzu-ff8754f921a0e9f1c7da02b768fad5584d3d22c5.tar.gz yuzu-ff8754f921a0e9f1c7da02b768fad5584d3d22c5.tar.xz yuzu-ff8754f921a0e9f1c7da02b768fad5584d3d22c5.zip | |
Merge pull request #747 from lioncash/unimplemented
gl_shader_manager: Remove unimplemented function prototype
Diffstat (limited to '')
| -rw-r--r-- | src/video_core/renderer_opengl/gl_shader_manager.cpp | 5 | ||||
| -rw-r--r-- | src/video_core/renderer_opengl/gl_shader_manager.h | 1 |
2 files changed, 3 insertions, 3 deletions
diff --git a/src/video_core/renderer_opengl/gl_shader_manager.cpp b/src/video_core/renderer_opengl/gl_shader_manager.cpp index 1aa437f76..e81fcbbc4 100644 --- a/src/video_core/renderer_opengl/gl_shader_manager.cpp +++ b/src/video_core/renderer_opengl/gl_shader_manager.cpp | |||
| @@ -10,8 +10,9 @@ | |||
| 10 | namespace GLShader { | 10 | namespace GLShader { |
| 11 | 11 | ||
| 12 | namespace Impl { | 12 | namespace Impl { |
| 13 | void SetShaderUniformBlockBinding(GLuint shader, const char* name, | 13 | static void SetShaderUniformBlockBinding(GLuint shader, const char* name, |
| 14 | Maxwell3D::Regs::ShaderStage binding, size_t expected_size) { | 14 | Maxwell3D::Regs::ShaderStage binding, |
| 15 | size_t expected_size) { | ||
| 15 | GLuint ub_index = glGetUniformBlockIndex(shader, name); | 16 | GLuint ub_index = glGetUniformBlockIndex(shader, name); |
| 16 | if (ub_index != GL_INVALID_INDEX) { | 17 | if (ub_index != GL_INVALID_INDEX) { |
| 17 | GLint ub_size = 0; | 18 | GLint ub_size = 0; |
diff --git a/src/video_core/renderer_opengl/gl_shader_manager.h b/src/video_core/renderer_opengl/gl_shader_manager.h index 4295c20a6..e29d551e1 100644 --- a/src/video_core/renderer_opengl/gl_shader_manager.h +++ b/src/video_core/renderer_opengl/gl_shader_manager.h | |||
| @@ -21,7 +21,6 @@ using Tegra::Engines::Maxwell3D; | |||
| 21 | 21 | ||
| 22 | namespace Impl { | 22 | namespace Impl { |
| 23 | void SetShaderUniformBlockBindings(GLuint shader); | 23 | void SetShaderUniformBlockBindings(GLuint shader); |
| 24 | void SetShaderSamplerBindings(GLuint shader); | ||
| 25 | } // namespace Impl | 24 | } // namespace Impl |
| 26 | 25 | ||
| 27 | /// Uniform structure for the Uniform Buffer Object, all vectors must be 16-byte aligned | 26 | /// Uniform structure for the Uniform Buffer Object, all vectors must be 16-byte aligned |