From 4f2ecd53a9daaf88bb7d075745eefb6e2e4741e0 Mon Sep 17 00:00:00 2001 From: wolfbeast Date: Wed, 11 Jul 2018 18:11:13 +0200 Subject: Roll back to ANGLE/2845 --- gfx/angle/src/common/utilities.cpp | 37 +------------------------------------ 1 file changed, 1 insertion(+), 36 deletions(-) (limited to 'gfx/angle/src/common/utilities.cpp') 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(param); -} - -template <> -GLint ConvertToGLint(GLfloat param) -{ - return iround(param); -} - -template <> -GLint ConvertFromGLfloat(GLfloat param) -{ - return iround(param); -} -template <> -GLuint ConvertFromGLfloat(GLfloat param) -{ - return uiround(param); -} - unsigned int ParseAndStripArrayIndex(std::string *name) { unsigned int subscript = GL_INVALID_INDEX; -- cgit v1.2.3