Re: [Mesa-dev] [PATCH 06/20] mesa: Move {split, merge}_location_offset to uniforms.h

2011-10-30 Thread Kenneth Graunke
On 10/28/2011 10:42 AM, Ian Romanick wrote: > From: Ian Romanick > > Also prepend _mesa_uniform_ to the names. > > Signed-off-by: Ian Romanick ... > -static void > -merge_location_offset(GLint *location, GLint offset) > -{ > - *location = (*location << 16) | offset; > -} ... > +/** > + * Comb

Re: [Mesa-dev] [PATCH 07/20] mesa: Refactor parameter validate for GetUniform, Uniform, and UniformMatrix

2011-10-30 Thread Kenneth Graunke
On 10/28/2011 10:42 AM, Ian Romanick wrote: > From: Ian Romanick > > Signed-off-by: Ian Romanick > --- > src/mesa/main/uniforms.c | 142 > +- > 1 files changed, 90 insertions(+), 52 deletions(-) > > diff --git a/src/mesa/main/uniforms.c b/src/mesa/

[Mesa-dev] [RFC-PATCH 11/11] st/mesa: add support for GL_OES_EGL_image_external

2011-10-30 Thread Chia-I Wu
From: Chia-I Wu To pipe drivers, external textures are just 2D textures. --- src/mesa/state_tracker/st_cb_texture.c |2 ++ src/mesa/state_tracker/st_extensions.c |2 ++ src/mesa/state_tracker/st_glsl_to_tgsi.cpp |3 +++ src/mesa/state_tracker/st_mesa_to_tgsi.c |1 + src

[Mesa-dev] [RFC-PATCH 10/11] mesa: add support for GL_OES_EGL_image_external

2011-10-30 Thread Chia-I Wu
From: Chia-I Wu This is an OpenGL ES specific extension. External textures are textures that may be sampled from, but not be updated (no glTexSubImage* and etc.). The image data are taken from an EGLImage. --- src/mesa/main/APIspec.xml|9 + src/mesa/main/attrib.c

[Mesa-dev] [RFC-PATCH 09/11] mesa: clean up validate_texture_wrap_mode

2011-10-30 Thread Chia-I Wu
From: Chia-I Wu GL_TEXTURE_RECTANGLE_NV (and soon GL_TEXTURE_EXTERNAL_OES) is special. Handle it in its own if-block. There should be no functional change. --- src/mesa/main/texparam.c | 42 +++--- 1 files changed, 27 insertions(+), 15 deletions(-) diff -

[Mesa-dev] [RFC-PATCH 08/11] mesa: fix a logic error in glFramebufferTexture2D

2011-10-30 Thread Chia-I Wu
From: Chia-I Wu Unrecognized texture target should give an error. --- src/mesa/main/fbobject.c |2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/src/mesa/main/fbobject.c b/src/mesa/main/fbobject.c index c56062a..5cc4417 100644 --- a/src/mesa/main/fbobject.c +++ b/src/mesa

[Mesa-dev] [RFC-PATCH 07/11] glsl: add support for GL_OES_EGL_image_external

2011-10-30 Thread Chia-I Wu
From: Chia-I Wu This extension introduces a new sampler type: samplerExternalOES. texture2D (and texture2DProj) can be used to do a texture look up in an external texture. --- src/glsl/ast.h |1 + src/glsl/ast_type.cpp |1 +

[Mesa-dev] [RFC-PATCH 06/11] mesa: add GL_OES_EGL_image_external to the extension list

2011-10-30 Thread Chia-I Wu
From: Chia-I Wu --- src/mesa/main/extensions.c |1 + src/mesa/main/mtypes.h |1 + 2 files changed, 2 insertions(+), 0 deletions(-) diff --git a/src/mesa/main/extensions.c b/src/mesa/main/extensions.c index 52b928e..ec9c47b 100644 --- a/src/mesa/main/extensions.c +++ b/src/mesa/main/

[Mesa-dev] [RFC-PATCH 05/11] mesa: add missing defines for GL_OES_EGL_image_external

2011-10-30 Thread Chia-I Wu
From: Chia-I Wu --- src/mesa/main/glheader.h |8 1 files changed, 8 insertions(+), 0 deletions(-) diff --git a/src/mesa/main/glheader.h b/src/mesa/main/glheader.h index 0df8119..c4fb157 100644 --- a/src/mesa/main/glheader.h +++ b/src/mesa/main/glheader.h @@ -66,6 +66,14 @@ typedef

[Mesa-dev] [RFC-PATCH 04/11] mesa, i965: prepare for more than 8 texture targets

2011-10-30 Thread Chia-I Wu
From: Chia-I Wu 3-bit fields are used store texture target in several places. That will fail when TEXTURE_EXTERNAL_INDEX, which happends to be the 9th texture target, is added. Make them 4-bit fields. --- src/mesa/drivers/dri/i965/brw_wm.h |2 +- src/mesa/main/ff_fragment_shader.cpp |

[Mesa-dev] [RFC-PATCH 03/11] glapi: regenerate files

2011-10-30 Thread Chia-I Wu
From: Chia-I Wu --- src/mesa/main/enums.c | 2368 + 1 files changed, 1190 insertions(+), 1178 deletions(-) ___ mesa-dev mailing list mesa-dev@lists.freedesktop.org http://lists.freedesktop.org/mailman/l

[Mesa-dev] [RFC-PATCH 02/11] glapi: add entry points for OES_EGL_image_external

2011-10-30 Thread Chia-I Wu
From: Chia-I Wu Only enums actually. --- src/mapi/glapi/gen/es_EXT.xml |8 1 files changed, 8 insertions(+), 0 deletions(-) diff --git a/src/mapi/glapi/gen/es_EXT.xml b/src/mapi/glapi/gen/es_EXT.xml index 1327bb6..bc98aee 100644 --- a/src/mapi/glapi/gen/es_EXT.xml +++ b/src/mapi/gl

[Mesa-dev] [RFC-PATCH 01/11] GLES: upgrade glext.h to revision 13240

2011-10-30 Thread Chia-I Wu
From: Chia-I Wu --- include/GLES/glext.h | 76 - 1 files changed, 74 insertions(+), 2 deletions(-) diff --git a/include/GLES/glext.h b/include/GLES/glext.h index 162909a..130e4b0 100644 --- a/include/GLES/glext.h +++ b/include/GLES/glext.h @@ -1

[Mesa-dev] [RFC-PATCH 00/11] add support for GL_OES_EGL_image_external

2011-10-30 Thread Chia-I Wu
From: Chia-I Wu Hi, This patch series adds support for the OpenGL ES specific GL_OES_EGL_image_external extension[1]. It is enabled in st/mesa. The extension adds a new texture target, GL_TEXTURE_EXTERNAL_OES. It can only be specified with an EGLImage. Calling gl*Tex*Image* to manipulate an

[Mesa-dev] [PATCH] Mesa-demos: add wglcontext to test the creation of a context through WGL_ARB_create_context

2011-10-30 Thread Morgan Armand
--- src/wgl/CMakeLists.txt |1 + src/wgl/wglcontext.c | 274 2 files changed, 275 insertions(+), 0 deletions(-) create mode 100644 src/wgl/wglcontext.c diff --git a/src/wgl/CMakeLists.txt b/src/wgl/CMakeLists.txt index 834e836..88e6a20 1006

Re: [Mesa-dev] [PATCH] llvmpipe: fix a crash in non-SSE path

2011-10-30 Thread Chia-I Wu
On Sun, Oct 30, 2011 at 8:11 PM, Keith Whitwell wrote: > Looks good to me. That is quick, thanks! I will go ahead and commit it. > Keith > > On Sun, 2011-10-30 at 20:05 +0800, Chia-I Wu wrote: >> From: Chia-I Wu >> >> It is a typo went unnoticed. >> --- >>  src/gallium/drivers/llvmpipe/lp_rast_t

Re: [Mesa-dev] [PATCH] llvmpipe: fix a crash in non-SSE path

2011-10-30 Thread Keith Whitwell
Looks good to me. Keith On Sun, 2011-10-30 at 20:05 +0800, Chia-I Wu wrote: > From: Chia-I Wu > > It is a typo went unnoticed. > --- > src/gallium/drivers/llvmpipe/lp_rast_tri.c |2 +- > 1 files changed, 1 insertions(+), 1 deletions(-) > > diff --git a/src/gallium/drivers/llvmpipe/lp_rast

[Mesa-dev] [PATCH] llvmpipe: fix a crash in non-SSE path

2011-10-30 Thread Chia-I Wu
From: Chia-I Wu It is a typo went unnoticed. --- src/gallium/drivers/llvmpipe/lp_rast_tri.c |2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/src/gallium/drivers/llvmpipe/lp_rast_tri.c b/src/gallium/drivers/llvmpipe/lp_rast_tri.c index 3adfbaa..71d0ddf 100644 --- a/src/g

[Mesa-dev] [PATCH 3/3] scons: include src/glsl/Makefile.sources

2011-10-30 Thread Chia-I Wu
--- src/glsl/SConscript | 82 +-- 1 files changed, 14 insertions(+), 68 deletions(-) diff --git a/src/glsl/SConscript b/src/glsl/SConscript index 09c7edb..b8154d6 100644 --- a/src/glsl/SConscript +++ b/src/glsl/SConscript @@ -30,78 +30,21 @@ glcpp

[Mesa-dev] [PATCH 2/3] android: include src/glsl/Makefile.sources

2011-10-30 Thread Chia-I Wu
This also fixes the build error due to missing link_uniforms.cpp in the source lists. --- src/glsl/Android.mk | 95 +- 1 files changed, 10 insertions(+), 85 deletions(-) diff --git a/src/glsl/Android.mk b/src/glsl/Android.mk index 9bf4ff7..d7d17dd

[Mesa-dev] [PATCH 1/3] glsl: Refactor source lists to Makefile.sources

2011-10-30 Thread Chia-I Wu
With the hope that Android.mk and SConscript can share the file to reduce future breakage. --- src/glsl/Makefile | 82 --- src/glsl/Makefile.sources | 104 + 2 files changed, 113 insertions(+), 73 deletions(-)