[Piglit] [PATCH] oes_compressed_paletted_texture: add OPENGL_INCLUDE_PATH to include path

Jose Fonseca jfonseca at vmware.com
Sat Dec 3 03:22:06 PST 2011



----- Original Message -----
> On 12/02/2011 03:40 PM, Marcin Slusarz wrote:
> > On Sun, Nov 27, 2011 at 09:09:07PM +0100, Marcin Slusarz wrote:
> >> Fixes:
> >> In file included from piglit/tests/util/piglit-util.h:57:0,
> >>                   from
> >>                   piglit/tests/spec/oes_compressed_paletted_texture/oes_compressed_paletted_texture-api.c:24:
> >> piglit/src/piglit/gl_wrap.h:59:22: fatal error: GLES/gl.h: No such
> >> file or directory
> >> ---
> >>   .../CMakeLists.gles1.txt                           |    1 +
> >>   1 files changed, 1 insertions(+), 0 deletions(-)
> >>
> >> diff --git
> >> a/tests/spec/oes_compressed_paletted_texture/CMakeLists.gles1.txt
> >> b/tests/spec/oes_compressed_paletted_texture/CMakeLists.gles1.txt
> >> index 9eb3bd2..c4829b7 100644
> >> ---
> >> a/tests/spec/oes_compressed_paletted_texture/CMakeLists.gles1.txt
> >> +++
> >> b/tests/spec/oes_compressed_paletted_texture/CMakeLists.gles1.txt
> >> @@ -1,4 +1,5 @@
> >>   include_directories(
> >> +	${OPENGL_INCLUDE_PATH}
> >>   	${piglit_SOURCE_DIR}/tests/util
> >>   )
> >>
> >> --
> >
> > ping?
> 
> 
> Looks OK to me, but I'm hardly a cmake expert.

I missed this before. Strictly speaking we should use a different include path for GLES -- it only works because both GL/gl.h and GLES/gl.h are in the same dir -- but this seems to be a generic problem with the piglit's cmake current usage.

So the right fix is to use pkg-config for egl/gles like mesademos now do, and use the appropriate paths. But Marcin's fix is good until we do that.

Jose


More information about the Piglit mailing list