diff options
| author | Pierre Bourdon <delroth@gmail.com> | 2014-07-19 01:28:37 +0200 |
|---|---|---|
| committer | Pierre Bourdon <delroth@gmail.com> | 2014-07-19 01:28:37 +0200 |
| commit | 5646ffdacdc0221720369df464f0e7addbacbd6f (patch) | |
| tree | fafb7892fd466a3d6a54ca66641a982a316da127 /Source/Core/VideoBackends/OGL/RasterFont.cpp | |
| parent | b9dc69105d0529c74a4f3c8f3579fa699f2d7bdc (diff) | |
| parent | bc9ef95643c73838800274be9afd691b542b9f1a (diff) | |
Merge pull request #471 from Sonicadvance1/sampler_binding
Support Sampler binding in the shader.
Diffstat (limited to 'Source/Core/VideoBackends/OGL/RasterFont.cpp')
| -rw-r--r-- | Source/Core/VideoBackends/OGL/RasterFont.cpp | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/Source/Core/VideoBackends/OGL/RasterFont.cpp b/Source/Core/VideoBackends/OGL/RasterFont.cpp index d281f9a554..7d96e03ab8 100644 --- a/Source/Core/VideoBackends/OGL/RasterFont.cpp +++ b/Source/Core/VideoBackends/OGL/RasterFont.cpp @@ -124,7 +124,7 @@ static const char *s_vertexShaderSrc = "}\n"; static const char *s_fragmentShaderSrc = - "uniform sampler2D samp8;\n" + "SAMPLER_BINDING(8) uniform sampler2D samp8;\n" "uniform vec4 color;\n" "in vec2 uv0;\n" "out vec4 ocol0;\n" |
