diff options
| author |  joshualitt <joshualitt@chromium.org> | 2014-10-27 15:33:33 -0700 |
|---|---|---|
| committer |  Commit bot <commit-bot@chromium.org> | 2014-10-27 15:33:33 -0700 |
| commit | 84c94c0dfd1e12e97d8a835882dda575f36e41d2 (patch) | |
| tree | 7992422b87bb7f3997c4525b3d21dc342b4ce2d4 /include/gpu | |
| parent | 76993edbe5dbbde07a843507184abf90c64d9928 (diff) | |
Working patch to remove constant attributes. This may cause some gm mismatches, I will rebaseline tonight.
BUG=skia:
Review URL: https://codereview.chromium.org/678073005
Diffstat (limited to 'include/gpu')
| -rw-r--r-- | include/gpu/gl/GrGLConfig.h | 10 | ||||
| -rw-r--r-- | include/gpu/gl/GrGLConfig_chrome.h | 4 |
2 files changed, 0 insertions, 14 deletions
diff --git a/include/gpu/gl/GrGLConfig.h b/include/gpu/gl/GrGLConfig.h index 444be00f15..4b3ab8b258 100644 --- a/include/gpu/gl/GrGLConfig.h +++ b/include/gpu/gl/GrGLConfig.h @@ -46,12 +46,6 @@ * GR_GL_CHECK_ERROR_START: controls the initial value of gCheckErrorGL * when GR_GL_CHECK_ERROR is 1. Defaults to 1. * - * GR_GL_NO_CONSTANT_ATTRIBUTES: if this evaluates to true then the GL backend - * will use uniforms instead of attributes in all cases when there is not - * per-vertex data. This is important when the underlying GL implementation - * 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_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: @@ -126,10 +120,6 @@ #define GR_GL_CHECK_ERROR_START 1 #endif -#if !defined(GR_GL_NO_CONSTANT_ATTRIBUTES) - #define GR_GL_NO_CONSTANT_ATTRIBUTES 0 -#endif - #if !defined(GR_GL_USE_BUFFER_DATA_NULL_HINT) #define GR_GL_USE_BUFFER_DATA_NULL_HINT 1 #endif diff --git a/include/gpu/gl/GrGLConfig_chrome.h b/include/gpu/gl/GrGLConfig_chrome.h index acad90450c..ee875b7f22 100644 --- a/include/gpu/gl/GrGLConfig_chrome.h +++ b/include/gpu/gl/GrGLConfig_chrome.h @@ -12,16 +12,12 @@ #define GR_GL_CHECK_ERROR_START 0 #if defined(SK_BUILD_FOR_WIN32) -// ANGLE creates a temp VB for vertex attributes not specified per-vertex. -#define GR_GL_NO_CONSTANT_ATTRIBUTES 1 - // For RGBA teximage/readpixels ANGLE will sw-convert to/from BGRA. #define GR_GL_RGBA_8888_PIXEL_OPS_SLOW 1 // ANGLE can go faster if the entire fbo is read rather than a subrect #define GR_GL_FULL_READPIXELS_FASTER_THAN_PARTIAL 1 #else -#define GR_GL_NO_CONSTANT_ATTRIBUTES 0 #define GR_GL_RGBA_8888_PIXEL_OPS_SLOW 0 #define GR_GL_FULL_READPIXELS_FASTER_THAN_PARTIAL 0 #endif |