Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(279)

Unified Diff: src/gpu/gl/GrGLGpu.cpp

Issue 1035243002: Housekeeping to rename GrGL compressed texture formats to match GL specs (Closed) Base URL: https://chromium.googlesource.com/skia@master
Patch Set: Created 5 years, 9 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
« no previous file with comments | « src/gpu/gl/GrGLDefines.h ('k') | third_party/ktx/ktx.cpp » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: src/gpu/gl/GrGLGpu.cpp
diff --git a/src/gpu/gl/GrGLGpu.cpp b/src/gpu/gl/GrGLGpu.cpp
index 0f7a0c152bd8dddc6ce6f548a65b409d6fe4053d..566c8c5b8bbb7f8506838cf992bfe615622904c6 100644
--- a/src/gpu/gl/GrGLGpu.cpp
+++ b/src/gpu/gl/GrGLGpu.cpp
@@ -2422,7 +2422,7 @@ bool GrGLGpu::configToGLFormats(GrPixelConfig config,
}
break;
case kETC1_GrPixelConfig:
- *internalFormat = GR_GL_COMPRESSED_RGB8_ETC1;
+ *internalFormat = GR_GL_COMPRESSED_ETC1_RGB8;
break;
case kLATC_GrPixelConfig:
switch(this->glCaps().latcAlias()) {
@@ -2438,11 +2438,11 @@ bool GrGLGpu::configToGLFormats(GrPixelConfig config,
}
break;
case kR11_EAC_GrPixelConfig:
- *internalFormat = GR_GL_COMPRESSED_R11;
+ *internalFormat = GR_GL_COMPRESSED_R11_EAC;
break;
case kASTC_12x12_GrPixelConfig:
- *internalFormat = GR_GL_COMPRESSED_RGBA_ASTC_12x12;
+ *internalFormat = GR_GL_COMPRESSED_RGBA_ASTC_12x12_KHR;
break;
case kRGBA_float_GrPixelConfig:
« no previous file with comments | « src/gpu/gl/GrGLDefines.h ('k') | third_party/ktx/ktx.cpp » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698