diff options
| author |  bsalomon <bsalomon@google.com> | 2015-06-24 13:22:50 -0700 |
|---|---|---|
| committer |  Commit bot <commit-bot@chromium.org> | 2015-06-24 13:22:50 -0700 |
| commit | 1e1adc33ba1acb9a2ad41c0a5a9b6166ee9d7a2a (patch) | |
| tree | f3978f17559721a0e69c556d975d057986678e70 /include/gpu | |
| parent | 4760f32f2a68acdcfee53eae98bbdabb19238e8d (diff) | |
remove workaround for dx9 angle slow rgba pixel ops
TBR=robertphillips@google.com
Review URL: https://codereview.chromium.org/1207003002
Diffstat (limited to 'include/gpu')
| -rw-r--r-- | include/gpu/gl/GrGLConfig.h | 8 | ||||
| -rw-r--r-- | include/gpu/gl/GrGLConfig_chrome.h | 8 |
2 files changed, 0 insertions, 16 deletions
diff --git a/include/gpu/gl/GrGLConfig.h b/include/gpu/gl/GrGLConfig.h index 93d5b395cb..665ebedf22 100644 --- a/include/gpu/gl/GrGLConfig.h +++ b/include/gpu/gl/GrGLConfig.h @@ -65,10 +65,6 @@ * The GrGLInterface field fCallback specifies the function ptr and there is an * additional field fCallbackData of type intptr_t for client data. * - * GR_GL_RGBA_8888_PIXEL_OPS_SLOW: Set this to 1 if it is known that performing - * glReadPixels / glTex(Sub)Image with format=GL_RGBA, type=GL_UNISIGNED_BYTE is - * significantly slower than format=GL_BGRA, type=GL_UNISIGNED_BYTE. - * * GR_GL_FULL_READPIXELS_FASTER_THAN_PARTIAL: Set this to 1 if calling * glReadPixels to read the entire framebuffer is faster than calling it with * the same sized rectangle but with a framebuffer bound that is larger than @@ -128,10 +124,6 @@ #define GR_GL_PER_GL_FUNC_CALLBACK 0 #endif -#if !defined(GR_GL_RGBA_8888_PIXEL_OPS_SLOW) - #define GR_GL_RGBA_8888_PIXEL_OPS_SLOW 0 -#endif - #if !defined(GR_GL_FULL_READPIXELS_FASTER_THAN_PARTIAL) #define GR_GL_FULL_READPIXELS_FASTER_THAN_PARTIAL 0 #endif diff --git a/include/gpu/gl/GrGLConfig_chrome.h b/include/gpu/gl/GrGLConfig_chrome.h index ee875b7f22..b4776ab934 100644 --- a/include/gpu/gl/GrGLConfig_chrome.h +++ b/include/gpu/gl/GrGLConfig_chrome.h @@ -12,13 +12,9 @@ #define GR_GL_CHECK_ERROR_START 0 #if defined(SK_BUILD_FOR_WIN32) -// 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_RGBA_8888_PIXEL_OPS_SLOW 0 #define GR_GL_FULL_READPIXELS_FASTER_THAN_PARTIAL 0 #endif @@ -43,8 +39,4 @@ // (const char* const instead of char**). #define GR_GL_USE_NEW_SHADER_SOURCE_SIGNATURE 1 -#if !defined(GR_GL_IGNORE_ES3_MSAA) - #define GR_GL_IGNORE_ES3_MSAA 1 -#endif - #endif |