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

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

Issue 140933005: Remove GR_GL_IGNORE_ES3_MSAA.s (Closed) Base URL: https://skia.googlecode.com/svn/trunk
Patch Set: fix whitespace Created 6 years, 11 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
Index: src/gpu/gl/GrGpuGL.cpp
diff --git a/src/gpu/gl/GrGpuGL.cpp b/src/gpu/gl/GrGpuGL.cpp
index 6f8d65332e0e78b6669feccdccb152373784b8a8..071d49de5025e754a980257dfe51bc927c98e6f1 100644
--- a/src/gpu/gl/GrGpuGL.cpp
+++ b/src/gpu/gl/GrGpuGL.cpp
@@ -714,13 +714,6 @@ static bool renderbuffer_storage_msaa(GrGLContext& ctx,
int width, int height) {
CLEAR_ERROR_BEFORE_ALLOC(ctx.interface());
SkASSERT(GrGLCaps::kNone_MSFBOType != ctx.caps()->msFBOType());
-#if GR_GL_IGNORE_ES3_MSAA
- GL_ALLOC_CALL(ctx.interface(),
- RenderbufferStorageMultisample(GR_GL_RENDERBUFFER,
- sampleCount,
- format,
- width, height));
-#else
switch (ctx.caps()->msFBOType()) {
case GrGLCaps::kDesktop_ARB_MSFBOType:
case GrGLCaps::kDesktop_EXT_MSFBOType:
@@ -750,7 +743,6 @@ static bool renderbuffer_storage_msaa(GrGLContext& ctx,
GrCrash("Shouldn't be here if we don't support multisampled renderbuffers.");
break;
}
-#endif
return (GR_GL_NO_ERROR == CHECK_ALLOC_ERROR(ctx.interface()));;
}

Powered by Google App Engine
This is Rietveld 408576698