commit da8d38015a6b80501f6f4b8912105e626e88086f
author daniel@transgaming.com <daniel@transgaming.com@736b8ea6-26fd-11df-bfd4-992fa37f6226> Thu Dec 20 21:12:55 2012 +0000
committer daniel@transgaming.com <daniel@transgaming.com@736b8ea6-26fd-11df-bfd4-992fa37f6226> Thu Dec 20 21:12:55 2012 +0000
tree c5ab3d3fad7e0e6db39ca51c0af853b2213a1e0e
parent e6d12e9d68141460f9adfe135a5741673a41eae5

Implemented support for DX11 sampler uniforms.

TRAC #22242
Signed-off-by: Daniel Koch
Signed-off-by: Shannon Woods
Author: Nicolas Capens

git-svn-id: https://angleproject.googlecode.com/svn/branches/dx11proto@1630 736b8ea6-26fd-11df-bfd4-992fa37f6226

src/libGLESv2/ProgramBinary.h

diff --git a/src/libGLESv2/ProgramBinary.h b/src/libGLESv2/ProgramBinary.h
index 91896fb..56b3e72 100644
--- a/src/libGLESv2/ProgramBinary.h
+++ b/src/libGLESv2/ProgramBinary.h
@@ -121,7 +121,7 @@
     bool defineUniform(InfoLog &infoLog, GLenum shader, const rx::D3DConstant *constant, const std::string &name,
                        rx::D3DConstantTable *vsConstantTable, rx::D3DConstantTable *psConstantTable);
     bool defineUniform(GLenum shader, const rx::D3DConstant *constant, const std::string &name);
-    bool defineUniform(GLenum shader, const sh::Uniform &constant);
+    bool defineUniform(GLenum shader, const sh::Uniform &constant, InfoLog &infoLog);
     Uniform *createUniform(const rx::D3DConstant *constant, const std::string &name);
     
     rx::Renderer *const mRenderer;