summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorbunnei <bunneidev@gmail.com>2018-07-21 19:54:58 +0200
committerGitHub <noreply@github.com>2018-07-21 19:54:58 +0200
commitff8754f921a0e9f1c7da02b768fad5584d3d22c5 (patch)
tree0b8b2a30fcc73468437c5c557379892748a0498b
parentMerge pull request #755 from lioncash/ctor (diff)
parentgl_shader_manager: Replace unimplemented function prototype (diff)
downloadyuzu-ff8754f921a0e9f1c7da02b768fad5584d3d22c5.tar
yuzu-ff8754f921a0e9f1c7da02b768fad5584d3d22c5.tar.gz
yuzu-ff8754f921a0e9f1c7da02b768fad5584d3d22c5.tar.bz2
yuzu-ff8754f921a0e9f1c7da02b768fad5584d3d22c5.tar.lz
yuzu-ff8754f921a0e9f1c7da02b768fad5584d3d22c5.tar.xz
yuzu-ff8754f921a0e9f1c7da02b768fad5584d3d22c5.tar.zst
yuzu-ff8754f921a0e9f1c7da02b768fad5584d3d22c5.zip
-rw-r--r--src/video_core/renderer_opengl/gl_shader_manager.cpp5
-rw-r--r--src/video_core/renderer_opengl/gl_shader_manager.h1
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 @@
namespace GLShader {
namespace Impl {
-void SetShaderUniformBlockBinding(GLuint shader, const char* name,
- Maxwell3D::Regs::ShaderStage binding, size_t expected_size) {
+static void SetShaderUniformBlockBinding(GLuint shader, const char* name,
+ Maxwell3D::Regs::ShaderStage binding,
+ size_t expected_size) {
GLuint ub_index = glGetUniformBlockIndex(shader, name);
if (ub_index != GL_INVALID_INDEX) {
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;
namespace Impl {
void SetShaderUniformBlockBindings(GLuint shader);
-void SetShaderSamplerBindings(GLuint shader);
} // namespace Impl
/// Uniform structure for the Uniform Buffer Object, all vectors must be 16-byte aligned