summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorPauli Nieminen <pauli.nieminen@linux.intel.com>2012-05-18 19:04:24 +0300
committerPauli Nieminen <pauli.nieminen@linux.intel.com>2012-05-21 18:26:00 +0300
commitd21c889a8e2d44d4f32e1e3a4a0b593b3ba77dd0 (patch)
tree18ddcc2a0d8d1b2b3cb65fcc661373ca2c129ab7
parentc349a199a8470fed8dbfe5be494d97e606607f71 (diff)
util: Support FBOs also with GLES1 and GL1egl_and_gles_dispatch
FBO extensions provide same functionality before GL 2.0. Those extensions are aliased to core functions in dispatch which allows same code to work in both cases. Signed-off-by: Pauli Nieminen <pauli.nieminen@linux.intel.com>
-rw-r--r--tests/util/piglit-framework.c10
1 files changed, 3 insertions, 7 deletions
diff --git a/tests/util/piglit-framework.c b/tests/util/piglit-framework.c
index 0ddfa14c..b5dbebe3 100644
--- a/tests/util/piglit-framework.c
+++ b/tests/util/piglit-framework.c
@@ -176,11 +176,11 @@ piglit_framework_fbo_init()
piglit_framework_fbo_glx_init();
glewInit();
-#ifdef USE_OPENGL
- if (piglit_get_gl_version() < 20)
+ if (piglit_get_gl_version() < 20 &&
+ !piglit_is_extension_supported("GL_ARB_framebuffer_object") &&
+ !piglit_is_extension_supported("GL_OES_framebuffer_object"))
return false;
-#endif
glGenFramebuffers(1, &piglit_winsys_fbo);
glBindFramebuffer(GL_FRAMEBUFFER, piglit_winsys_fbo);
@@ -199,11 +199,7 @@ piglit_framework_fbo_init()
if (piglit_window_mode & (GLUT_DEPTH | GLUT_STENCIL)) {
GLenum depth_stencil;
-#ifdef USE_OPENGL
depth_stencil = GL_DEPTH_STENCIL;
-#else
- depth_stencil = GL_DEPTH_STENCIL_OES;
-#endif
glGenTextures(1, &depth);
glBindTexture(GL_TEXTURE_2D, depth);