Thank you. Can you push it as well? I don't have commit access.
On Sat, Jan 11, 2014 at 2:59 AM, Chad Versace <[email protected]> wrote: > On Tue, Jan 07, 2014 at 12:02:40AM +0800, Daniel Kurtz wrote: >> glGenFramebuffers is not supported for OpenGL ES 1.X, so init_gl is >> hard coded to always fail for ES1. Thus, there is no way to use a >> fbo_framework w/ ES1. In this case, just fail faster in >> piglit_fbo_framework_create() instead of first initializing a wfl >> framework, just to destroy it again in the failure path. >> >> Signed-off-by: Daniel Kurtz <[email protected]> >> --- >> tests/util/piglit-framework-gl/piglit_fbo_framework.c | 4 ++++ >> 1 file changed, 4 insertions(+) >> >> diff --git a/tests/util/piglit-framework-gl/piglit_fbo_framework.c >> b/tests/util/piglit-framework-gl/piglit_fbo_framework.c >> index 219b80d..d27706e 100644 >> --- a/tests/util/piglit-framework-gl/piglit_fbo_framework.c >> +++ b/tests/util/piglit-framework-gl/piglit_fbo_framework.c >> @@ -128,6 +128,9 @@ init_gl(struct piglit_wfl_framework *wfl_fw) >> struct piglit_gl_framework* >> piglit_fbo_framework_create(const struct piglit_gl_test_config *test_config) >> { >> +#ifdef PIGLIT_USE_OPENGL_ES1 >> + return false; >> +#else >> struct piglit_wfl_framework *wfl_fw; >> struct piglit_gl_framework *gl_fw; >> >> @@ -158,4 +161,5 @@ piglit_fbo_framework_create(const struct >> piglit_gl_test_config *test_config) >> fail: >> destroy(gl_fw); >> return NULL; >> +#endif /* PIGLIT_USE_OPENGL_ES1 */ >> } > > This makes sense to me. > Reviewed-by: Chad Versace <[email protected]> > >> _______________________________________________ Piglit mailing list [email protected] http://lists.freedesktop.org/mailman/listinfo/piglit
