diff options
Diffstat (limited to 'gfx/angle/src/common/utilities.cpp')
-rwxr-xr-x | gfx/angle/src/common/utilities.cpp | 37 |
1 files changed, 1 insertions, 36 deletions
diff --git a/gfx/angle/src/common/utilities.cpp b/gfx/angle/src/common/utilities.cpp index 89e383405..d9e8b660e 100755 --- a/gfx/angle/src/common/utilities.cpp +++ b/gfx/angle/src/common/utilities.cpp @@ -247,19 +247,7 @@ int VariableRowCount(GLenum type) case GL_SAMPLER_2D_SHADOW: case GL_SAMPLER_CUBE_SHADOW: case GL_SAMPLER_2D_ARRAY_SHADOW: - case GL_IMAGE_2D: - case GL_INT_IMAGE_2D: - case GL_UNSIGNED_INT_IMAGE_2D: - case GL_IMAGE_2D_ARRAY: - case GL_INT_IMAGE_2D_ARRAY: - case GL_UNSIGNED_INT_IMAGE_2D_ARRAY: - case GL_IMAGE_3D: - case GL_INT_IMAGE_3D: - case GL_UNSIGNED_INT_IMAGE_3D: - case GL_IMAGE_CUBE: - case GL_INT_IMAGE_CUBE: - case GL_UNSIGNED_INT_IMAGE_CUBE: - return 1; + return 1; case GL_FLOAT_MAT2: case GL_FLOAT_MAT3x2: case GL_FLOAT_MAT4x2: @@ -656,29 +644,6 @@ std::string ParseUniformName(const std::string &name, size_t *outSubscript) return name.substr(0, open); } -template <> -GLuint ConvertToGLuint(GLfloat param) -{ - return uiround<GLuint>(param); -} - -template <> -GLint ConvertToGLint(GLfloat param) -{ - return iround<GLint>(param); -} - -template <> -GLint ConvertFromGLfloat(GLfloat param) -{ - return iround<GLint>(param); -} -template <> -GLuint ConvertFromGLfloat(GLfloat param) -{ - return uiround<GLuint>(param); -} - unsigned int ParseAndStripArrayIndex(std::string *name) { unsigned int subscript = GL_INVALID_INDEX; |