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
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/
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
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
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 -
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
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 +
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/
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
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 |
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
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
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
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
---
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
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
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
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
---
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
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
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(-)
21 matches
Mail list logo