From 341767c9fc6577fbd6b7ed57a12f03f565788025 Mon Sep 17 00:00:00 2001 From: "bsalomon@google.com" Date: Fri, 11 May 2012 20:47:39 +0000 Subject: Remove support for vertex attribute matrices Review URL: http://codereview.appspot.com/6200065/ git-svn-id: http://skia.googlecode.com/svn/trunk@3917 2bbb7eff-a529-9590-31e7-b0007b416f81 --- include/gpu/gl/GrGLConfig.h | 14 -------------- 1 file changed, 14 deletions(-) (limited to 'include') diff --git a/include/gpu/gl/GrGLConfig.h b/include/gpu/gl/GrGLConfig.h index 7a47687769..5932bb932e 100644 --- a/include/gpu/gl/GrGLConfig.h +++ b/include/gpu/gl/GrGLConfig.h @@ -52,12 +52,6 @@ * doesn't actually support immediate style attribute values (e.g. when * the GL stream is converted to DX as in ANGLE on Chrome). Defaults to 0. * - * GR_GL_ATTRIBUTE_MATRICES: If changing uniforms is very expensive it may be - * faster to use vertex attributes for matrices (set via glVertexAttrib3fv). - * Setting this build flag enables this behavior. GR_GL_NO_CONSTANT_ATTRIBUTES - * must not be set since this uses constant attributes for the matrices. - * Defaults to 0. - * * GR_GL_USE_BUFFER_DATA_NULL_HINT: When specifing new data for a vertex/index * buffer that replaces old data Ganesh can give a hint to the driver that the * previous data will not be used in future draws like this: @@ -120,10 +114,6 @@ #define GR_GL_NO_CONSTANT_ATTRIBUTES 0 #endif -#if !defined(GR_GL_ATTRIBUTE_MATRICES) - #define GR_GL_ATTRIBUTE_MATRICES 0 -#endif - #if !defined(GR_GL_USE_BUFFER_DATA_NULL_HINT) #define GR_GL_USE_BUFFER_DATA_NULL_HINT 1 #endif @@ -177,8 +167,4 @@ (GR_MAC_BUILD && \ !GR_GL_USE_BUFFER_DATA_NULL_HINT) -#if(GR_GL_NO_CONSTANT_ATTRIBUTES) && (GR_GL_ATTRIBUTE_MATRICES) - #error "Cannot combine GR_GL_NO_CONSTANT_ATTRIBUTES and GR_GL_ATTRIBUTE_MATRICES" -#endif - #endif -- cgit v1.2.3