diff options
| author |  bsalomon@google.com <bsalomon@google.com@2bbb7eff-a529-9590-31e7-b0007b416f81> | 2011-11-18 18:23:59 +0000 |
|---|---|---|
| committer | bsalomon@google.com <bsalomon@google.com@2bbb7eff-a529-9590-31e7-b0007b416f81> | 2011-11-18 18:23:59 +0000 |
| commit | e1d3127ed4d5f5a1fca462b8faebbde52b000e1e (patch) | |
| tree | 71be8d0aa56a22df2ddabb694402a21682730105 /include/gpu | |
| parent | 598a1ff72ae06d96b53540307777be665800cece (diff) | |
Revert 2714 for debugging of test failure
git-svn-id: http://skia.googlecode.com/svn/trunk@2715 2bbb7eff-a529-9590-31e7-b0007b416f81
Diffstat (limited to 'include/gpu')
| -rw-r--r-- | include/gpu/GrGLConfig.h | 10 | ||||
| -rw-r--r-- | include/gpu/GrGLConfig_chrome.h | 4 |
2 files changed, 7 insertions, 7 deletions
diff --git a/include/gpu/GrGLConfig.h b/include/gpu/GrGLConfig.h index cfb5141a18..ea7bcf341c 100644 --- a/include/gpu/GrGLConfig.h +++ b/include/gpu/GrGLConfig.h @@ -78,9 +78,9 @@ * 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_RGBA_8888_READBACK_SLOW: Set this to 1 if it is known that performing + * glReadPixels with format=GL_RGBA, type=GL_UNISIGNED_BYTE is significantly + * slower than format=GL_BGRA, type=GL_UNISIGNED_BYTE. */ #if !defined(GR_GL_LOG_CALLS) @@ -115,8 +115,8 @@ #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 +#if !defined(GR_GL_RGBA_8888_READBACK_SLOW) + #define GR_GL_RGBA_8888_READBACK_SLOW 0 #endif #if(GR_GL_NO_CONSTANT_ATTRIBUTES) && (GR_GL_ATTRIBUTE_MATRICES) diff --git a/include/gpu/GrGLConfig_chrome.h b/include/gpu/GrGLConfig_chrome.h index 72d330acc5..79324ab511 100644 --- a/include/gpu/GrGLConfig_chrome.h +++ b/include/gpu/GrGLConfig_chrome.h @@ -14,8 +14,8 @@ // ANGLE creates a temp VB for vertex attributes not specified per-vertex. #define GR_GL_NO_CONSTANT_ATTRIBUTES GR_WIN32_BUILD -// For RGBA teximage/readpixels ANGLE will sw-convert to/from BGRA. -#define GR_GL_RGBA_8888_PIXEL_OPS_SLOW GR_WIN32_BUILD +// RGBA Readbacks are a slow path in ANGLE +#define GR_GL_RGBA_8888_READBACK_SLOW GR_WIN32_BUILD // cmd buffer allocates memory and memsets it to zero when it sees glBufferData // with NULL. |