Rename GrGLBug to GrGLCapability.
Default all architectures to kProbe_GrGLCapability.
Use new facilities better from GrGpuGL.cpp
git-svn-id: http://skia.googlecode.com/svn/trunk@1613 2bbb7eff-a529-9590-31e7-b0007b416f81
diff --git a/gpu/src/GrGpuGL.cpp b/gpu/src/GrGpuGL.cpp
index 973e1e4..e40024a 100644
--- a/gpu/src/GrGpuGL.cpp
+++ b/gpu/src/GrGpuGL.cpp
@@ -471,11 +471,13 @@
// TODO: Make these a preprocess that generate some compile time constants.
// TODO: probe once at startup, rather than once per context creation.
- if (GrGLGetGLInterface()->fNPOTRenderTargetSupport < 0) {
+ int expectNPOTTargets = GrGLGetGLInterface()->fNPOTRenderTargetSupport;
+ if (expectNPOTTargets == kProbe_GrGLCapability) {
fNPOTRenderTargetSupport =
probe_for_npot_render_target_support(fNPOTTextureSupport);
} else {
- fNPOTRenderTargetSupport = GrGLGetGLInterface()->fNPOTRenderTargetSupport;
+ GrAssert(expectNPOTTargets == 0 || expectNPOTTargets == 1);
+ fNPOTRenderTargetSupport = static_cast<bool>(expectNPOTTargets);
}
if (gPrintStartupSpew) {
@@ -503,14 +505,14 @@
fMaxRenderTargetSize = GrMin(fMaxTextureSize, fMaxRenderTargetSize);
fMinRenderTargetHeight = GrGLGetGLInterface()->fMinRenderTargetHeight;
- if (fMinRenderTargetHeight < 0) {
+ if (fMinRenderTargetHeight == kProbe_GrGLCapability) {
fMinRenderTargetHeight =
probe_for_min_render_target_height(fNPOTRenderTargetSupport,
fMaxRenderTargetSize);
}
fMinRenderTargetWidth = GrGLGetGLInterface()->fMinRenderTargetWidth;
- if (fMinRenderTargetWidth < 0) {
+ if (fMinRenderTargetWidth == kProbe_GrGLCapability) {
fMinRenderTargetWidth =
probe_for_min_render_target_width(fNPOTRenderTargetSupport,
fMaxRenderTargetSize);
diff --git a/gpu/src/android/GrGLDefaultInterface_android.cpp b/gpu/src/android/GrGLDefaultInterface_android.cpp
index 54bc2f6..4c06f17 100644
--- a/gpu/src/android/GrGLDefaultInterface_android.cpp
+++ b/gpu/src/android/GrGLDefaultInterface_android.cpp
@@ -19,9 +19,9 @@
void GrGLSetDefaultGLInterface() {
static GrGLInterface cmd_buffer_interface = {
kES2_GrGLBinding,
- kProbe_GrGLBug, // fNPOTRenderTargetSupport
- kProbe_GrGLBug, // fMinRenderTargetHeight
- kProbe_GrGLBug, // fMinRenderTargetWidth
+ kProbe_GrGLCapability, // fNPOTRenderTargetSupport
+ kProbe_GrGLCapability, // fMinRenderTargetHeight
+ kProbe_GrGLCapability, // fMinRenderTargetWidth
glActiveTexture,
glAttachShader,
glBindAttribLocation,
diff --git a/gpu/src/mac/GrGLDefaultInterface_mac.cpp b/gpu/src/mac/GrGLDefaultInterface_mac.cpp
index cfa528a..d21bdda 100644
--- a/gpu/src/mac/GrGLDefaultInterface_mac.cpp
+++ b/gpu/src/mac/GrGLDefaultInterface_mac.cpp
@@ -23,9 +23,9 @@
static GrGLInterface gDefaultInterface;
static bool gDefaultInterfaceInit;
if (!gDefaultInterfaceInit) {
- gDefaultInterface.fNPOTRenderTargetSupport = true;
- gDefaultInterface.fMinRenderTargetHeight = 1;
- gDefaultInterface.fMinRenderTargetWidth = 1;
+ gDefaultInterface.fNPOTRenderTargetSupport = kProbe_GrGLCapability;
+ gDefaultInterface.fMinRenderTargetHeight = kProbe_GrGLCapability;
+ gDefaultInterface.fMinRenderTargetWidth = kProbe_GrGLCapability;
gDefaultInterface.fActiveTexture = glActiveTexture;
gDefaultInterface.fAttachShader = glAttachShader;
diff --git a/gpu/src/mesa/GrGLDefaultInterface_mesa.cpp b/gpu/src/mesa/GrGLDefaultInterface_mesa.cpp
index bc75a2c..1324649 100644
--- a/gpu/src/mesa/GrGLDefaultInterface_mesa.cpp
+++ b/gpu/src/mesa/GrGLDefaultInterface_mesa.cpp
@@ -38,9 +38,9 @@
// We must have array and element_array buffer objects.
return;
}
- gDefaultInterface.fNPOTRenderTargetSupport = true;
- gDefaultInterface.fMinRenderTargetHeight = 1;
- gDefaultInterface.fMinRenderTargetWidth = 1;
+ gDefaultInterface.fNPOTRenderTargetSupport = kProbe_GrGLCapability;
+ gDefaultInterface.fMinRenderTargetHeight = kProbe_GrGLCapability;
+ gDefaultInterface.fMinRenderTargetWidth = kProbe_GrGLCapability;
gDefaultInterface.fActiveTexture = glActiveTexture;
GR_GL_GET_PROC(AttachShader);
diff --git a/gpu/src/unix/GrGLDefaultInterface_unix.cpp b/gpu/src/unix/GrGLDefaultInterface_unix.cpp
index 2e233e0..724f438 100644
--- a/gpu/src/unix/GrGLDefaultInterface_unix.cpp
+++ b/gpu/src/unix/GrGLDefaultInterface_unix.cpp
@@ -40,9 +40,9 @@
return;
}
- gDefaultInterface.fNPOTRenderTargetSupport = true;
- gDefaultInterface.fMinRenderTargetHeight = 1;
- gDefaultInterface.fMinRenderTargetWidth = 1;
+ gDefaultInterface.fNPOTRenderTargetSupport = kProbe_GrGLCapability;
+ gDefaultInterface.fMinRenderTargetHeight = kProbe_GrGLCapability;
+ gDefaultInterface.fMinRenderTargetWidth = kProbe_GrGLCapability;
gDefaultInterface.fActiveTexture = glActiveTexture;
GR_GL_GET_PROC(AttachShader);
diff --git a/gpu/src/win/GrGLDefaultInterface_win.cpp b/gpu/src/win/GrGLDefaultInterface_win.cpp
index 9b40a94..3bbd262 100644
--- a/gpu/src/win/GrGLDefaultInterface_win.cpp
+++ b/gpu/src/win/GrGLDefaultInterface_win.cpp
@@ -45,9 +45,9 @@
return;
}
- gDefaultInterface.fNPOTRenderTargetSupport = true;
- gDefaultInterface.fMinRenderTargetHeight = 1;
- gDefaultInterface.fMinRenderTargetWidth = 1;
+ gDefaultInterface.fNPOTRenderTargetSupport = kProbe_GrGLCapability;
+ gDefaultInterface.fMinRenderTargetHeight = kProbe_GrGLCapability;
+ gDefaultInterface.fMinRenderTargetWidth = kProbe_GrGLCapability;
// Functions that are part of GL 1.1 will return NULL in
// wglGetProcAddress