Mesa (vmkernel-main): mesa: Bump version to 10.1 (final)
Module: Mesa Branch: vmkernel-main Commit: 4a86465f4754a0d79ed98f2d1ce425864854418b URL: http://cgit.freedesktop.org/mesa/mesa/commit/?id=4a86465f4754a0d79ed98f2d1ce425864854418b Author: Ian Romanick ian.d.roman...@intel.com Date: Wed Mar 5 08:59:46 2014 +0200 mesa: Bump version to 10.1 (final) Signed-off-by: Ian Romanick ian.d.roman...@intel.com --- VERSION |2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/VERSION b/VERSION index 4b9caf0..4149c39 100644 --- a/VERSION +++ b/VERSION @@ -1 +1 @@ -10.1.0-rc3 +10.1.0 ___ mesa-commit mailing list mesa-commit@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/mesa-commit
Mesa (master): mesa: fix glGetInteger*(GL_SAMPLER_BINDING).
Module: Mesa
Branch: master
Commit: 5984a911f9dda3f7421bdec604d30d0dfe2cea5e
URL:
http://cgit.freedesktop.org/mesa/mesa/commit/?id=5984a911f9dda3f7421bdec604d30d0dfe2cea5e
Author: Alan Hourihane al...@vmware.com
Date: Wed Mar 6 18:14:01 2013 +
mesa: fix glGetInteger*(GL_SAMPLER_BINDING).
If the sampler object has been deleted on another context, an
alternative context may reference the old sampler. So ensure the sampler
object still exists.
Note: this is a candidate for the stable branch.
Signed-off-by: Alan Hourihane al...@vmware.com
Reviewed-by: Brian Paul bri...@vmware.com
---
src/mesa/main/get.c| 12 +++-
src/mesa/main/samplerobj.c |2 +-
src/mesa/main/samplerobj.h |2 ++
3 files changed, 14 insertions(+), 2 deletions(-)
diff --git a/src/mesa/main/get.c b/src/mesa/main/get.c
index 2399f9c..582ef31 100644
--- a/src/mesa/main/get.c
+++ b/src/mesa/main/get.c
@@ -34,6 +34,7 @@
#include state.h
#include texcompress.h
#include framebuffer.h
+#include samplerobj.h
/* This is a table driven implemetation of the glGet*v() functions.
* The basic idea is that most getters just look up an int somewhere
@@ -827,7 +828,16 @@ find_custom_value(struct gl_context *ctx, const struct
value_desc *d, union valu
{
struct gl_sampler_object *samp =
ctx-Texture.Unit[ctx-Texture.CurrentUnit].Sampler;
- v-value_int = samp ? samp-Name : 0;
+
+ /*
+ * The sampler object may have been deleted on another context,
+ * so we try to lookup the sampler object before returning its Name.
+ */
+ if (samp _mesa_lookup_samplerobj(ctx, samp-Name)) {
+v-value_int = samp-Name;
+ } else {
+v-value_int = 0;
+ }
}
break;
/* GL_ARB_uniform_buffer_object */
diff --git a/src/mesa/main/samplerobj.c b/src/mesa/main/samplerobj.c
index 4664cc3..5cff329 100644
--- a/src/mesa/main/samplerobj.c
+++ b/src/mesa/main/samplerobj.c
@@ -40,7 +40,7 @@
#include main/samplerobj.h
-static struct gl_sampler_object *
+struct gl_sampler_object *
_mesa_lookup_samplerobj(struct gl_context *ctx, GLuint name)
{
if (name == 0)
diff --git a/src/mesa/main/samplerobj.h b/src/mesa/main/samplerobj.h
index 3114257..69e3899 100644
--- a/src/mesa/main/samplerobj.h
+++ b/src/mesa/main/samplerobj.h
@@ -62,6 +62,8 @@ _mesa_reference_sampler_object(struct gl_context *ctx,
_mesa_reference_sampler_object_(ctx, ptr, samp);
}
+extern struct gl_sampler_object *
+_mesa_lookup_samplerobj(struct gl_context *ctx, GLuint name);
extern struct gl_sampler_object *
_mesa_new_sampler_object(struct gl_context *ctx, GLuint name);
___
mesa-commit mailing list
mesa-commit@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/mesa-commit
Mesa (master): Unreference sampler object when it' s currently bound to texture unit.
Module: Mesa
Branch: master
Commit: cf0b4a30fc536f3744bce209d4b356fe82f2e6a3
URL:
http://cgit.freedesktop.org/mesa/mesa/commit/?id=cf0b4a30fc536f3744bce209d4b356fe82f2e6a3
Author: Alan Hourihane al...@vmware.com
Date: Wed Mar 6 16:08:58 2013 +
Unreference sampler object when it's currently bound to texture unit.
This change specifically unbinds a sampler object from the texture unit
if it's bound to a unit. The spec calls for default object when deleting
sampler objects which are currently bound.
Note: this is a candidate for the stable branches
Signed-off-by: Alan Hourihane al...@vmware.com
Reviewed-by: Brian Paul bri...@vmware.com
---
src/mesa/main/samplerobj.c | 10 ++
1 files changed, 10 insertions(+), 0 deletions(-)
diff --git a/src/mesa/main/samplerobj.c b/src/mesa/main/samplerobj.c
index 319a444..4664cc3 100644
--- a/src/mesa/main/samplerobj.c
+++ b/src/mesa/main/samplerobj.c
@@ -206,9 +206,19 @@ _mesa_DeleteSamplers(GLsizei count, const GLuint *samplers)
for (i = 0; i count; i++) {
if (samplers[i]) {
+ GLuint j;
struct gl_sampler_object *sampObj =
_mesa_lookup_samplerobj(ctx, samplers[i]);
+
if (sampObj) {
+/* If the sampler is currently bound, unbind it. */
+for (j = 0; j ctx-Const.MaxCombinedTextureImageUnits; j++) {
+ if (ctx-Texture.Unit[j].Sampler == sampObj) {
+ FLUSH_VERTICES(ctx, _NEW_TEXTURE);
+ _mesa_reference_sampler_object(ctx,
ctx-Texture.Unit[j].Sampler, NULL);
+ }
+}
+
/* The ID is immediately freed for re-use */
_mesa_HashRemove(ctx-Shared-SamplerObjects, samplers[i]);
/* But the object exists until its reference count goes to zero */
___
mesa-commit mailing list
mesa-commit@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/mesa-commit
Mesa (master): Add missing GL_TEXTURE_CUBE_MAP entry in _mesa_legal_texture_dimensions
Module: Mesa Branch: master Commit: 196443f3f5b43d26895043701ea0cdabfaa78210 URL: http://cgit.freedesktop.org/mesa/mesa/commit/?id=196443f3f5b43d26895043701ea0cdabfaa78210 Author: Alan Hourihane al...@vmware.com Date: Tue Mar 5 12:05:26 2013 + Add missing GL_TEXTURE_CUBE_MAP entry in _mesa_legal_texture_dimensions This was hit on the glTexStorage2D() path. Note: this is a candidate for the stable branches Signed-off-by: Alan Hourihane al...@vmware.com Reviewed-by: Brian Paul bri...@vmware.com --- src/mesa/main/teximage.c |1 + 1 files changed, 1 insertions(+), 0 deletions(-) diff --git a/src/mesa/main/teximage.c b/src/mesa/main/teximage.c index 0dcf88a..9d4a170 100644 --- a/src/mesa/main/teximage.c +++ b/src/mesa/main/teximage.c @@ -1416,6 +1416,7 @@ _mesa_legal_texture_dimensions(struct gl_context *ctx, GLenum target, return GL_FALSE; return GL_TRUE; + case GL_TEXTURE_CUBE_MAP: case GL_TEXTURE_CUBE_MAP_POSITIVE_X: case GL_TEXTURE_CUBE_MAP_NEGATIVE_X: case GL_TEXTURE_CUBE_MAP_POSITIVE_Y: ___ mesa-commit mailing list mesa-commit@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/mesa-commit
Mesa (master): glx: Check HAVE_XF86VIDMODE before adding it as an implicit link
Module: Mesa Branch: master Commit: 6479922499638b81569db20394c6cb59e6baf989 URL: http://cgit.freedesktop.org/mesa/mesa/commit/?id=6479922499638b81569db20394c6cb59e6baf989 Author: Alan Hourihane al...@vmware.com Date: Tue Jun 28 17:40:24 2011 +0100 glx: Check HAVE_XF86VIDMODE before adding it as an implicit link library. --- configure.ac |6 +- 1 files changed, 5 insertions(+), 1 deletions(-) diff --git a/configure.ac b/configure.ac index 7fbba7d..acf9f06 100644 --- a/configure.ac +++ b/configure.ac @@ -883,7 +883,11 @@ dri|no) # these checks are still desired when there is no mesa_driver else # should check these... X11_INCLUDES=$X11_INCLUDES $X_CFLAGS -GL_LIB_DEPS=$X_LIBS -lX11 -lXext -lXxf86vm -lXdamage -lXfixes +if test x$HAVE_XF86VIDMODE == xyes; then + GL_LIB_DEPS=$X_LIBS -lX11 -lXext -lXxf86vm -lXdamage -lXfixes + else + GL_LIB_DEPS=$X_LIBS -lX11 -lXext -lXdamage -lXfixes + fi GL_PC_LIB_PRIV=$GL_LIB_DEPS GL_PC_CFLAGS=$X11_INCLUDES ___ mesa-commit mailing list mesa-commit@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/mesa-commit
Mesa (master): Check for out of memory when creating fence
Module: Mesa Branch: master Commit: 53fe5b334ee2d373cec861580121f3ece06bdd07 URL: http://cgit.freedesktop.org/mesa/mesa/commit/?id=53fe5b334ee2d373cec861580121f3ece06bdd07 Author: Alan Hourihane al...@vmware.com Date: Sat Feb 26 10:30:19 2011 + Check for out of memory when creating fence --- src/gallium/drivers/llvmpipe/lp_fence.c |3 +++ 1 files changed, 3 insertions(+), 0 deletions(-) diff --git a/src/gallium/drivers/llvmpipe/lp_fence.c b/src/gallium/drivers/llvmpipe/lp_fence.c index 3a55e76..a21a3c7 100644 --- a/src/gallium/drivers/llvmpipe/lp_fence.c +++ b/src/gallium/drivers/llvmpipe/lp_fence.c @@ -47,6 +47,9 @@ lp_fence_create(unsigned rank) static int fence_id; struct lp_fence *fence = CALLOC_STRUCT(lp_fence); + if (!fence) + return NULL; + pipe_reference_init(fence-reference, 1); pipe_mutex_init(fence-mutex); ___ mesa-commit mailing list mesa-commit@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/mesa-commit
Mesa (master): llvmpipe: ensure all bins are reset avoids memory corruption .
Module: Mesa
Branch: master
Commit: 5a723afabbaad9dcf5da280c6ab56397811de4b8
URL:
http://cgit.freedesktop.org/mesa/mesa/commit/?id=5a723afabbaad9dcf5da280c6ab56397811de4b8
Author: Alan Hourihane al...@vmware.com
Date: Tue Jul 6 11:42:18 2010 +0100
llvmpipe: ensure all bins are reset avoids memory corruption.
---
src/gallium/drivers/llvmpipe/lp_scene.c |4 ++--
1 files changed, 2 insertions(+), 2 deletions(-)
diff --git a/src/gallium/drivers/llvmpipe/lp_scene.c
b/src/gallium/drivers/llvmpipe/lp_scene.c
index 845c175..e8d36bb 100644
--- a/src/gallium/drivers/llvmpipe/lp_scene.c
+++ b/src/gallium/drivers/llvmpipe/lp_scene.c
@@ -162,8 +162,8 @@ lp_scene_reset(struct lp_scene *scene )
/* Free all but last binner command lists:
*/
- for (i = 0; i scene-tiles_x; i++) {
- for (j = 0; j scene-tiles_y; j++) {
+ for (i = 0; i TILES_X; i++) {
+ for (j = 0; j TILES_Y; j++) {
lp_scene_bin_reset(scene, i, j);
}
}
___
mesa-commit mailing list
mesa-commit@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/mesa-commit
Mesa (master): draw: handle some out of memory conditions
Module: Mesa Branch: master Commit: 1c377cea1094c0b5414c663adf2fd393bf41ddfb URL: http://cgit.freedesktop.org/mesa/mesa/commit/?id=1c377cea1094c0b5414c663adf2fd393bf41ddfb Author: Alan Hourihane al...@vmware.com Date: Wed Jun 16 12:27:20 2010 +0100 draw: handle some out of memory conditions --- src/gallium/auxiliary/draw/draw_pipe_aaline.c |8 src/gallium/auxiliary/draw/draw_pipe_aapoint.c|8 src/gallium/auxiliary/draw/draw_pipe_clip.c |6 +++--- src/gallium/auxiliary/draw/draw_pipe_cull.c |6 +++--- src/gallium/auxiliary/draw/draw_pipe_flatshade.c |6 +++--- src/gallium/auxiliary/draw/draw_pipe_offset.c | 13 ++--- src/gallium/auxiliary/draw/draw_pipe_pstipple.c | 13 +++-- src/gallium/auxiliary/draw/draw_pipe_stipple.c| 13 +++-- src/gallium/auxiliary/draw/draw_pipe_twoside.c|6 +++--- src/gallium/auxiliary/draw/draw_pipe_unfilled.c |6 +++--- src/gallium/auxiliary/draw/draw_pipe_wide_line.c | 13 +++-- src/gallium/auxiliary/draw/draw_pipe_wide_point.c |6 +++--- 12 files changed, 69 insertions(+), 35 deletions(-) diff --git a/src/gallium/auxiliary/draw/draw_pipe_aaline.c b/src/gallium/auxiliary/draw/draw_pipe_aaline.c index 4faf0a7..debd17f 100644 --- a/src/gallium/auxiliary/draw/draw_pipe_aaline.c +++ b/src/gallium/auxiliary/draw/draw_pipe_aaline.c @@ -788,9 +788,6 @@ draw_aaline_stage(struct draw_context *draw) if (aaline == NULL) return NULL; - if (!draw_alloc_temp_verts( aaline-stage, 8 )) - goto fail; - aaline-stage.draw = draw; aaline-stage.name = aaline; aaline-stage.next = NULL; @@ -801,11 +798,14 @@ draw_aaline_stage(struct draw_context *draw) aaline-stage.reset_stipple_counter = aaline_reset_stipple_counter; aaline-stage.destroy = aaline_destroy; + if (!draw_alloc_temp_verts( aaline-stage, 8 )) + goto fail; + return aaline; fail: if (aaline) - aaline_destroy(aaline-stage); + aaline-stage.destroy(aaline-stage); return NULL; } diff --git a/src/gallium/auxiliary/draw/draw_pipe_aapoint.c b/src/gallium/auxiliary/draw/draw_pipe_aapoint.c index bba6f50..d406a86 100644 --- a/src/gallium/auxiliary/draw/draw_pipe_aapoint.c +++ b/src/gallium/auxiliary/draw/draw_pipe_aapoint.c @@ -780,9 +780,6 @@ draw_aapoint_stage(struct draw_context *draw) if (aapoint == NULL) goto fail; - if (!draw_alloc_temp_verts( aapoint-stage, 4 )) - goto fail; - aapoint-stage.draw = draw; aapoint-stage.name = aapoint; aapoint-stage.next = NULL; @@ -793,11 +790,14 @@ draw_aapoint_stage(struct draw_context *draw) aapoint-stage.reset_stipple_counter = aapoint_reset_stipple_counter; aapoint-stage.destroy = aapoint_destroy; + if (!draw_alloc_temp_verts( aapoint-stage, 4 )) + goto fail; + return aapoint; fail: if (aapoint) - aapoint_destroy(aapoint-stage); + aapoint-stage.destroy(aapoint-stage); return NULL; diff --git a/src/gallium/auxiliary/draw/draw_pipe_clip.c b/src/gallium/auxiliary/draw/draw_pipe_clip.c index df8d82e..122b1c7 100644 --- a/src/gallium/auxiliary/draw/draw_pipe_clip.c +++ b/src/gallium/auxiliary/draw/draw_pipe_clip.c @@ -522,9 +522,6 @@ struct draw_stage *draw_clip_stage( struct draw_context *draw ) if (clipper == NULL) goto fail; - if (!draw_alloc_temp_verts( clipper-stage, MAX_CLIPPED_VERTICES+1 )) - goto fail; - clipper-stage.draw = draw; clipper-stage.name = clipper; clipper-stage.point = clip_point; @@ -536,6 +533,9 @@ struct draw_stage *draw_clip_stage( struct draw_context *draw ) clipper-plane = draw-plane; + if (!draw_alloc_temp_verts( clipper-stage, MAX_CLIPPED_VERTICES+1 )) + goto fail; + return clipper-stage; fail: diff --git a/src/gallium/auxiliary/draw/draw_pipe_cull.c b/src/gallium/auxiliary/draw/draw_pipe_cull.c index bf84ce3..2f4d01d 100644 --- a/src/gallium/auxiliary/draw/draw_pipe_cull.c +++ b/src/gallium/auxiliary/draw/draw_pipe_cull.c @@ -129,9 +129,6 @@ struct draw_stage *draw_cull_stage( struct draw_context *draw ) if (cull == NULL) goto fail; - if (!draw_alloc_temp_verts( cull-stage, 0 )) - goto fail; - cull-stage.draw = draw; cull-stage.name = cull; cull-stage.next = NULL; @@ -142,6 +139,9 @@ struct draw_stage *draw_cull_stage( struct draw_context *draw ) cull-stage.reset_stipple_counter = cull_reset_stipple_counter; cull-stage.destroy = cull_destroy; + if (!draw_alloc_temp_verts( cull-stage, 0 )) + goto fail; + return cull-stage; fail: diff --git a/src/gallium/auxiliary/draw/draw_pipe_flatshade.c b/src/gallium/auxiliary/draw/draw_pipe_flatshade.c index 34afb1a..693f289 100644 --- a/src/gallium/auxiliary/draw/draw_pipe_flatshade.c +++ b/src/gallium/auxiliary/draw/draw_pipe_flatshade.c @@ -257,9 +257,6 @@ struct draw_stage *draw_flatshade_stage( struct draw_context *draw
Mesa (master): draw: add alloc check
Module: Mesa Branch: master Commit: 51729b5119df450f2f80c4e648b99fa35b9ec32d URL: http://cgit.freedesktop.org/mesa/mesa/commit/?id=51729b5119df450f2f80c4e648b99fa35b9ec32d Author: Alan Hourihane al...@vmware.com Date: Wed Jun 16 17:55:00 2010 +0100 draw: add alloc check --- src/gallium/auxiliary/draw/draw_llvm.c |2 ++ 1 files changed, 2 insertions(+), 0 deletions(-) diff --git a/src/gallium/auxiliary/draw/draw_llvm.c b/src/gallium/auxiliary/draw/draw_llvm.c index bd5d885..9117c13 100644 --- a/src/gallium/auxiliary/draw/draw_llvm.c +++ b/src/gallium/auxiliary/draw/draw_llvm.c @@ -173,6 +173,8 @@ draw_llvm_create(struct draw_context *draw) #endif llvm = CALLOC_STRUCT( draw_llvm ); + if (!llvm) + return NULL; llvm-draw = draw; llvm-engine = draw-engine; ___ mesa-commit mailing list mesa-commit@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/mesa-commit
Mesa (master): util: add alloc check
Module: Mesa
Branch: master
Commit: 867478b6f6fe3ad76c3d1d75b2b907f59b9a649c
URL:
http://cgit.freedesktop.org/mesa/mesa/commit/?id=867478b6f6fe3ad76c3d1d75b2b907f59b9a649c
Author: Alan Hourihane al...@vmware.com
Date: Wed Jun 16 18:10:34 2010 +0100
util: add alloc check
---
src/gallium/auxiliary/util/u_upload_mgr.c |2 ++
1 files changed, 2 insertions(+), 0 deletions(-)
diff --git a/src/gallium/auxiliary/util/u_upload_mgr.c
b/src/gallium/auxiliary/util/u_upload_mgr.c
index 75d4443..af229e6 100644
--- a/src/gallium/auxiliary/util/u_upload_mgr.c
+++ b/src/gallium/auxiliary/util/u_upload_mgr.c
@@ -59,6 +59,8 @@ struct u_upload_mgr *u_upload_create( struct pipe_context
*pipe,
unsigned usage )
{
struct u_upload_mgr *upload = CALLOC_STRUCT( u_upload_mgr );
+ if (!upload)
+ return NULL;
upload-pipe = pipe;
upload-default_size = default_size;
___
mesa-commit mailing list
mesa-commit@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/mesa-commit
Mesa (master): mesa: silence compiler warning
Module: Mesa
Branch: master
Commit: 8b3bf9c299b4e7f68d4207b8d4ebb00d79ebf6d8
URL:
http://cgit.freedesktop.org/mesa/mesa/commit/?id=8b3bf9c299b4e7f68d4207b8d4ebb00d79ebf6d8
Author: Alan Hourihane al...@vmware.com
Date: Thu May 13 18:49:02 2010 +0100
mesa: silence compiler warning
---
src/mesa/main/get.c |4 +++-
1 files changed, 3 insertions(+), 1 deletions(-)
diff --git a/src/mesa/main/get.c b/src/mesa/main/get.c
index fbb659c..d2dcddd 100644
--- a/src/mesa/main/get.c
+++ b/src/mesa/main/get.c
@@ -1757,8 +1757,10 @@ find_value(const char *func, GLenum pname, void **p,
union value *v)
default:
assert(0);
break;
-
}
+
+ /* silence warning */
+ return error_value;
}
static const int transpose[] = {
___
mesa-commit mailing list
mesa-commit@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/mesa-commit
Mesa (master): gallivm: BGNFOR/ENDFOR fallthrough to BGNLOOP/ENDLOOP
Module: Mesa Branch: master Commit: 06574e45b418dab1ec106773c92b7d9e5af45c81 URL: http://cgit.freedesktop.org/mesa/mesa/commit/?id=06574e45b418dab1ec106773c92b7d9e5af45c81 Author: Alan Hourihane al...@vmware.com Date: Mon Apr 26 17:42:51 2010 +0100 gallivm: BGNFOR/ENDFOR fallthrough to BGNLOOP/ENDLOOP --- src/gallium/auxiliary/gallivm/lp_bld_tgsi_soa.c | 12 ++-- 1 files changed, 2 insertions(+), 10 deletions(-) diff --git a/src/gallium/auxiliary/gallivm/lp_bld_tgsi_soa.c b/src/gallium/auxiliary/gallivm/lp_bld_tgsi_soa.c index 16741e4..fac90c6 100644 --- a/src/gallium/auxiliary/gallivm/lp_bld_tgsi_soa.c +++ b/src/gallium/auxiliary/gallivm/lp_bld_tgsi_soa.c @@ -1601,11 +1601,7 @@ emit_instruction( break; case TGSI_OPCODE_BGNFOR: - /* deprecated */ - assert(0); - return FALSE; - break; - + /* fall through */ case TGSI_OPCODE_BGNLOOP: lp_exec_bgnloop(bld-exec_mask); break; @@ -1625,11 +1621,7 @@ emit_instruction( break; case TGSI_OPCODE_ENDFOR: - /* deprecated */ - assert(0); - return FALSE; - break; - + /* fall-through */ case TGSI_OPCODE_ENDLOOP: lp_exec_endloop(bld-exec_mask); break; ___ mesa-commit mailing list mesa-commit@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/mesa-commit
Mesa (master): llvmpipe: update for half float formats
Module: Mesa
Branch: master
Commit: 00f8e5764d5b41714704c94575a5b6f873340a2f
URL:
http://cgit.freedesktop.org/mesa/mesa/commit/?id=00f8e5764d5b41714704c94575a5b6f873340a2f
Author: Alan Hourihane al...@vmware.com
Date: Fri Apr 23 19:26:03 2010 +0100
llvmpipe: update for half float formats
---
src/gallium/drivers/llvmpipe/lp_tile_soa.py |2 +-
1 files changed, 1 insertions(+), 1 deletions(-)
diff --git a/src/gallium/drivers/llvmpipe/lp_tile_soa.py
b/src/gallium/drivers/llvmpipe/lp_tile_soa.py
index 65810b6..4e9cd7e 100644
--- a/src/gallium/drivers/llvmpipe/lp_tile_soa.py
+++ b/src/gallium/drivers/llvmpipe/lp_tile_soa.py
@@ -58,7 +58,7 @@ def is_format_supported(format):
channel = format.channels[i]
if channel.type not in (VOID, UNSIGNED, SIGNED, FLOAT):
return False
-if channel.type == FLOAT and channel.size not in (32 ,64):
+if channel.type == FLOAT and channel.size not in (16, 32 ,64):
return False
if format.colorspace not in ('rgb', 'srgb'):
___
mesa-commit mailing list
mesa-commit@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/mesa-commit
Mesa (master): llvmpipe: silence warning
Module: Mesa
Branch: master
Commit: 17c560d1a46690c0d3812b81bf2d05a54b116786
URL:
http://cgit.freedesktop.org/mesa/mesa/commit/?id=17c560d1a46690c0d3812b81bf2d05a54b116786
Author: Alan Hourihane al...@vmware.com
Date: Tue Apr 20 10:33:56 2010 +0100
llvmpipe: silence warning
---
src/gallium/drivers/llvmpipe/lp_texture.c |2 +-
1 files changed, 1 insertions(+), 1 deletions(-)
diff --git a/src/gallium/drivers/llvmpipe/lp_texture.c
b/src/gallium/drivers/llvmpipe/lp_texture.c
index 45739e9..01854ca 100644
--- a/src/gallium/drivers/llvmpipe/lp_texture.c
+++ b/src/gallium/drivers/llvmpipe/lp_texture.c
@@ -999,7 +999,7 @@ llvmpipe_get_texture_image_all(struct llvmpipe_resource
*lpr,
{
const int slices = lpr-num_slices_faces[level];
int slice;
- void *map;
+ void *map = NULL;
assert(slices 0);
___
mesa-commit mailing list
mesa-commit@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/mesa-commit
Mesa (master): gallium: disable tests when using embedded build
Module: Mesa
Branch: master
Commit: cd834499ebdb1178eeab804497e4f18471fffbf6
URL:
http://cgit.freedesktop.org/mesa/mesa/commit/?id=cd834499ebdb1178eeab804497e4f18471fffbf6
Author: Alan Hourihane al...@vmware.com
Date: Tue Apr 13 12:54:36 2010 +0100
gallium: disable tests when using embedded build
---
src/gallium/SConscript |5 +++--
1 files changed, 3 insertions(+), 2 deletions(-)
diff --git a/src/gallium/SConscript b/src/gallium/SConscript
index 0353b05..6c0e7a5 100644
--- a/src/gallium/SConscript
+++ b/src/gallium/SConscript
@@ -23,5 +23,6 @@ SConscript('winsys/SConscript')
SConscript('targets/SConscript')
-SConscript('tests/unit/SConscript')
-#SConscript('tests/raw/SConscript')
+if platform != 'embedded':
+ SConscript('tests/unit/SConscript')
+ #SConscript('tests/raw/SConscript')
___
mesa-commit mailing list
mesa-commit@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/mesa-commit
Mesa (master): llvmpipe: disable half float formats
Module: Mesa Branch: master Commit: efc69ca61cf8fe7d2d44d177e7737999b6a114b5 URL: http://cgit.freedesktop.org/mesa/mesa/commit/?id=efc69ca61cf8fe7d2d44d177e7737999b6a114b5 Author: Alan Hourihane al...@vmware.com Date: Tue Apr 13 15:40:29 2010 +0100 llvmpipe: disable half float formats --- src/gallium/drivers/llvmpipe/lp_screen.c |5 + 1 files changed, 5 insertions(+), 0 deletions(-) diff --git a/src/gallium/drivers/llvmpipe/lp_screen.c b/src/gallium/drivers/llvmpipe/lp_screen.c index 6d309c6..a30f3c4 100644 --- a/src/gallium/drivers/llvmpipe/lp_screen.c +++ b/src/gallium/drivers/llvmpipe/lp_screen.c @@ -187,6 +187,11 @@ llvmpipe_is_format_supported( struct pipe_screen *_screen, case PIPE_FORMAT_DXT3_RGBA: case PIPE_FORMAT_DXT5_RGBA: return util_format_s3tc_enabled; + case PIPE_FORMAT_R16_FLOAT: + case PIPE_FORMAT_R16G16_FLOAT: + case PIPE_FORMAT_R16G16B16_FLOAT: + case PIPE_FORMAT_R16G16B16A16_FLOAT: + return FALSE; default: break; } ___ mesa-commit mailing list mesa-commit@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/mesa-commit
Mesa (master): Add format B5G5R5X1
Module: Mesa
Branch: master
Commit: 94abc4b51e134bee1ace2b57400e35c295bda6f8
URL:
http://cgit.freedesktop.org/mesa/mesa/commit/?id=94abc4b51e134bee1ace2b57400e35c295bda6f8
Author: Alan Hourihane al...@vmware.com
Date: Thu Mar 18 18:01:05 2010 +
Add format B5G5R5X1
---
src/gallium/auxiliary/util/u_format.csv |1 +
src/gallium/auxiliary/util/u_format_tests.c |7 +++
src/gallium/auxiliary/util/u_gen_mipmap.c |1 +
src/gallium/auxiliary/util/u_pack_color.h | 19 +
src/gallium/auxiliary/util/u_tile.c | 55 +++
src/gallium/include/pipe/p_format.h |1 +
6 files changed, 84 insertions(+), 0 deletions(-)
diff --git a/src/gallium/auxiliary/util/u_format.csv
b/src/gallium/auxiliary/util/u_format.csv
index 96a0fa6..11243e7 100644
--- a/src/gallium/auxiliary/util/u_format.csv
+++ b/src/gallium/auxiliary/util/u_format.csv
@@ -63,6 +63,7 @@ PIPE_FORMAT_A8R8G8B8_UNORM, plain, 1, 1, un8 , un8 ,
un8 , un8 , yzwx, r
PIPE_FORMAT_X8R8G8B8_UNORM, plain, 1, 1, un8 , un8 , un8 , un8 , yzw1,
rgb
PIPE_FORMAT_A8B8G8R8_UNORM, plain, 1, 1, un8 , un8 , un8 , un8 , wzyx,
rgb
PIPE_FORMAT_X8B8G8R8_UNORM, plain, 1, 1, un8 , un8 , un8 , un8 , wzy1,
rgb
+PIPE_FORMAT_B5G5R5X1_UNORM, plain, 1, 1, un5 , un5 , un5 , un1 , zyx1,
rgb
PIPE_FORMAT_B5G5R5A1_UNORM, plain, 1, 1, un5 , un5 , un5 , un1 , zyxw,
rgb
PIPE_FORMAT_B4G4R4A4_UNORM, plain, 1, 1, un4 , un4 , un4 , un4 , zyxw,
rgb
PIPE_FORMAT_B5G6R5_UNORM , plain, 1, 1, un5 , un6 , un5 , , zyx1,
rgb
diff --git a/src/gallium/auxiliary/util/u_format_tests.c
b/src/gallium/auxiliary/util/u_format_tests.c
index 182a474..9d6debc 100644
--- a/src/gallium/auxiliary/util/u_format_tests.c
+++ b/src/gallium/auxiliary/util/u_format_tests.c
@@ -120,6 +120,13 @@ util_format_test_cases[] =
* 16-bit rendertarget formats
*/
+ {PIPE_FORMAT_B5G5R5X1_UNORM, PACKED_1x16(0x7fff), PACKED_1x16(0x),
{0.0, 0.0, 0.0, 0.0}},
+ {PIPE_FORMAT_B5G5R5X1_UNORM, PACKED_1x16(0x7fff), PACKED_1x16(0x001f),
{0.0, 0.0, 1.0, 0.0}},
+ {PIPE_FORMAT_B5G5R5X1_UNORM, PACKED_1x16(0x7fff), PACKED_1x16(0x03e0),
{0.0, 1.0, 0.0, 0.0}},
+ {PIPE_FORMAT_B5G5R5X1_UNORM, PACKED_1x16(0x7fff), PACKED_1x16(0x7c00),
{1.0, 0.0, 0.0, 0.0}},
+ {PIPE_FORMAT_B5G5R5X1_UNORM, PACKED_1x16(0x7fff), PACKED_1x16(0x8000),
{0.0, 0.0, 0.0, 1.0}},
+ {PIPE_FORMAT_B5G5R5X1_UNORM, PACKED_1x16(0x7fff), PACKED_1x16(0x),
{1.0, 1.0, 1.0, 1.0}},
+
{PIPE_FORMAT_B5G5R5A1_UNORM, PACKED_1x16(0x), PACKED_1x16(0x),
{0.0, 0.0, 0.0, 0.0}},
{PIPE_FORMAT_B5G5R5A1_UNORM, PACKED_1x16(0x), PACKED_1x16(0x001f),
{0.0, 0.0, 1.0, 0.0}},
{PIPE_FORMAT_B5G5R5A1_UNORM, PACKED_1x16(0x), PACKED_1x16(0x03e0),
{0.0, 1.0, 0.0, 0.0}},
diff --git a/src/gallium/auxiliary/util/u_gen_mipmap.c
b/src/gallium/auxiliary/util/u_gen_mipmap.c
index 61d64cf..509d387 100644
--- a/src/gallium/auxiliary/util/u_gen_mipmap.c
+++ b/src/gallium/auxiliary/util/u_gen_mipmap.c
@@ -938,6 +938,7 @@ format_to_type_comps(enum pipe_format pformat,
*datatype = DTYPE_UBYTE;
*comps = 4;
return;
+ case PIPE_FORMAT_B5G5R5X1_UNORM:
case PIPE_FORMAT_B5G5R5A1_UNORM:
*datatype = DTYPE_USHORT_1_5_5_5_REV;
*comps = 4;
diff --git a/src/gallium/auxiliary/util/u_pack_color.h
b/src/gallium/auxiliary/util/u_pack_color.h
index 50f1b16..c5fd7a6 100644
--- a/src/gallium/auxiliary/util/u_pack_color.h
+++ b/src/gallium/auxiliary/util/u_pack_color.h
@@ -92,6 +92,11 @@ util_pack_color_ub(ubyte r, ubyte g, ubyte b, ubyte a,
uc-us = ((r 0xf8) 8) | ((g 0xfc) 3) | (b 3);
}
return;
+ case PIPE_FORMAT_B5G5R5X1_UNORM:
+ {
+ uc-us = ((0x80) 8) | ((r 0xf8) 7) | ((g 0xf8) 2) | (b
3);
+ }
+ return;
case PIPE_FORMAT_B5G5R5A1_UNORM:
{
uc-us = ((a 0x80) 8) | ((r 0xf8) 7) | ((g 0xf8) 2) |
(b 3);
@@ -216,6 +221,15 @@ util_unpack_color_ub(enum pipe_format format, union
util_color *uc,
*a = (ubyte) 0xff;
}
return;
+ case PIPE_FORMAT_B5G5R5X1_UNORM:
+ {
+ ushort p = uc-us;
+ *r = (ubyte) (((p 7) 0xf8) | ((p 12) 0x7));
+ *g = (ubyte) (((p 2) 0xf8) | ((p 7) 0x7));
+ *b = (ubyte) (((p 3) 0xf8) | ((p 2) 0x7));
+ *a = (ubyte) 0xff;
+ }
+ return;
case PIPE_FORMAT_B5G5R5A1_UNORM:
{
ushort p = uc-us;
@@ -361,6 +375,11 @@ util_pack_color(const float rgba[4], enum pipe_format
format, union util_color *
uc-us = ((r 0xf8) 8) | ((g 0xfc) 3) | (b 3);
}
return;
+ case PIPE_FORMAT_B5G5R5X1_UNORM:
+ {
+ uc-us = ((0x80) 8) | ((r 0xf8) 7) | ((g 0xf8) 2) | (b
3);
+ }
+ return;
case PIPE_FORMAT_B5G5R5A1_UNORM:
{
uc-us = ((a 0x80) 8) | ((r 0xf8) 7) | ((g 0xf8) 2) |
(b 3);
diff --git a/src/gallium/auxiliary/util
Mesa (master): another gcc 4.2.x check for mstackrealign
Module: Mesa
Branch: master
Commit: 7683271e63e4527fc72f309472181c743922e7e9
URL:
http://cgit.freedesktop.org/mesa/mesa/commit/?id=7683271e63e4527fc72f309472181c743922e7e9
Author: Alan Hourihane al...@vmware.com
Date: Fri Jan 29 10:22:22 2010 +
another gcc 4.2.x check for mstackrealign
---
scons/gallium.py |5 -
1 files changed, 4 insertions(+), 1 deletions(-)
diff --git a/scons/gallium.py b/scons/gallium.py
index 0385620..ac68bd6 100644
--- a/scons/gallium.py
+++ b/scons/gallium.py
@@ -276,8 +276,11 @@ def generate(env):
# instead.
ccflags += [
'-mmmx', '-msse', '-msse2', # enable SIMD intrinsics
-'-mstackrealign', # ensure stack is aligned
]
+ if distutils.version.LooseVersion(ccversion) =
distutils.version.LooseVersion('4.2'):
+ ccflags += [
+ '-mstackrealign', # ensure stack is aligned
+ ]
if env['machine'] == 'x86_64':
ccflags += ['-m64']
# See also:
___
mesa-commit mailing list
mesa-commit@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/mesa-commit
Mesa (master): add PIPE_SUBSYSTEM_EMBEDDED when embedded platform used
Module: Mesa Branch: master Commit: bd60e6cd5ce7c19e52338f12f73dfa1b622391d5 URL: http://cgit.freedesktop.org/mesa/mesa/commit/?id=bd60e6cd5ce7c19e52338f12f73dfa1b622391d5 Author: Alan Hourihane al...@vmware.com Date: Thu Jan 28 15:34:10 2010 + add PIPE_SUBSYSTEM_EMBEDDED when embedded platform used --- scons/gallium.py |2 ++ 1 files changed, 2 insertions(+), 0 deletions(-) diff --git a/scons/gallium.py b/scons/gallium.py index 467b67f..0385620 100644 --- a/scons/gallium.py +++ b/scons/gallium.py @@ -229,6 +229,8 @@ def generate(env): if platform == 'wince': cppdefines += ['PIPE_SUBSYSTEM_WINDOWS_CE'] cppdefines += ['PIPE_SUBSYSTEM_WINDOWS_CE_OGL'] +if platform == 'embedded': +cppdefines += ['PIPE_SUBSYSTEM_EMBEDDED'] env.Append(CPPDEFINES = cppdefines) # C compiler options ___ mesa-commit mailing list mesa-commit@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/mesa-commit
Mesa (master): Don't define HAVE_POSIX_MEMALIGN for embedded target.
Module: Mesa
Branch: master
Commit: 75cd6f3ece181b231dcf287bcb928f24f0d10962
URL:
http://cgit.freedesktop.org/mesa/mesa/commit/?id=75cd6f3ece181b231dcf287bcb928f24f0d10962
Author: Alan Hourihane al...@vmware.com
Date: Thu Jan 28 17:22:35 2010 +
Don't define HAVE_POSIX_MEMALIGN for embedded target.
---
SConstruct |3 ++-
1 files changed, 2 insertions(+), 1 deletions(-)
diff --git a/SConstruct b/SConstruct
index 3b8a9e0..9f1e8a7 100644
--- a/SConstruct
+++ b/SConstruct
@@ -126,8 +126,9 @@ if platform in ('posix', 'linux', 'freebsd', 'darwin',
'embedded'):
'_GNU_SOURCE',
'PTHREADS',
- 'HAVE_POSIX_MEMALIGN',
])
+ if platform != 'embedded':
+ env.Append(CPPDEFINES = ['HAVE_POSIX_MEMALIGN'])
if platform == 'darwin':
env.Append(CPPDEFINES = ['_DARWIN_C_SOURCE'])
env.Append(CPPPATH = ['/usr/X11R6/include'])
___
mesa-commit mailing list
mesa-commit@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/mesa-commit
Mesa (master): define own embedded target and cleanup previous commit.
Module: Mesa
Branch: master
Commit: 32e6043150077662323c66ff05334c8d8952fc04
URL:
http://cgit.freedesktop.org/mesa/mesa/commit/?id=32e6043150077662323c66ff05334c8d8952fc04
Author: Alan Hourihane al...@vmware.com
Date: Thu Jan 28 17:26:05 2010 +
define own embedded target and cleanup previous commit.
---
SConstruct | 28 +++-
1 files changed, 19 insertions(+), 9 deletions(-)
diff --git a/SConstruct b/SConstruct
index 9f1e8a7..1c7550d 100644
--- a/SConstruct
+++ b/SConstruct
@@ -115,9 +115,25 @@ env.Append(CPPPATH = [
if env['msvc']:
env.Append(CPPPATH = ['#include/c99'])
+# Embedded
+if platform == 'embedded':
+ env.Append(CPPDEFINES = [
+ '_POSIX_SOURCE',
+ ('_POSIX_C_SOURCE', '199309L'),
+ '_SVID_SOURCE',
+ '_BSD_SOURCE',
+ '_GNU_SOURCE',
+
+ 'PTHREADS',
+ ])
+ env.Append(LIBS = [
+ 'm',
+ 'pthread',
+ 'dl',
+ ])
# Posix
-if platform in ('posix', 'linux', 'freebsd', 'darwin', 'embedded'):
+if platform in ('posix', 'linux', 'freebsd', 'darwin'):
env.Append(CPPDEFINES = [
'_POSIX_SOURCE',
('_POSIX_C_SOURCE', '199309L'),
@@ -126,9 +142,8 @@ if platform in ('posix', 'linux', 'freebsd', 'darwin',
'embedded'):
'_GNU_SOURCE',
'PTHREADS',
+ 'HAVE_POSIX_MEMALIGN',
])
- if platform != 'embedded':
- env.Append(CPPDEFINES = ['HAVE_POSIX_MEMALIGN'])
if platform == 'darwin':
env.Append(CPPDEFINES = ['_DARWIN_C_SOURCE'])
env.Append(CPPPATH = ['/usr/X11R6/include'])
@@ -136,14 +151,9 @@ if platform in ('posix', 'linux', 'freebsd', 'darwin',
'embedded'):
env.Append(LIBS = [
'm',
'pthread',
+ 'expat',
'dl',
])
- if platform != 'embedded':
- env.Append(LIBS = [
- 'expat',
- ])
-
-
# DRI
if dri:
___
mesa-commit mailing list
mesa-commit@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/mesa-commit
Mesa (master): Duplicate CCVERSION check code to compensate for different env CC.
Module: Mesa
Branch: master
Commit: 1ecf505087136c1120f440c265c57418b14d0442
URL:
http://cgit.freedesktop.org/mesa/mesa/commit/?id=1ecf505087136c1120f440c265c57418b14d0442
Author: Alan Hourihane al...@vmware.com
Date: Wed Jan 27 12:46:46 2010 +
Duplicate CCVERSION check code to compensate for different env CC.
---
scons/gallium.py | 18 --
1 files changed, 16 insertions(+), 2 deletions(-)
diff --git a/scons/gallium.py b/scons/gallium.py
index c88af96..91a2fbb 100644
--- a/scons/gallium.py
+++ b/scons/gallium.py
@@ -34,6 +34,7 @@ import distutils.version
import os
import os.path
import re
+import subprocess
import SCons.Action
import SCons.Builder
@@ -109,6 +110,9 @@ def generate(env):
env['toolchain'] = 'wcesdk'
env.Tool(env['toolchain'])
+if os.environ.has_key('CC'):
+env['CC'] = os.environ['CC']
+
env['gcc'] = 'gcc' in os.path.basename(env['CC']).split('-')
env['msvc'] = env['CC'] == 'cl'
@@ -232,9 +236,19 @@ def generate(env):
cxxflags = [] # C++
ccflags = [] # C C++
if gcc:
+ccversion = ''
+pipe = SCons.Action._subproc(env, [env['CC'], '--version'],
+ stdin = 'devnull',
+ stderr = 'devnull',
+ stdout = subprocess.PIPE)
+if pipe.wait() == 0:
+line = pipe.stdout.readline()
+match = re.search(r'[0-9]+(\.[0-9]+)+', line)
+if match:
+ ccversion = match.group(0)
if debug:
ccflags += ['-O0', '-g3']
-elif env['CCVERSION'].startswith('4.2.'):
+elif ccversion.startswith('4.2.'):
# gcc 4.2.x optimizer is broken
print warning: gcc 4.2.x optimizer is broken -- disabling
optimizations
ccflags += ['-O0', '-g3']
@@ -277,7 +291,7 @@ def generate(env):
'-Wmissing-prototypes',
'-std=gnu99',
]
-if distutils.version.LooseVersion(env['CCVERSION']) =
distutils.version.LooseVersion('4.2'):
+if distutils.version.LooseVersion(ccversion) =
distutils.version.LooseVersion('4.2'):
ccflags += [
'-Werror=pointer-arith',
]
___
mesa-commit mailing list
mesa-commit@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/mesa-commit
Mesa (master): only use -Werror flags with gcc 4.2.x and 4.3.x.
Module: Mesa
Branch: master
Commit: 1019f0de1170f627e8e9ce7b449f7a76d89c6742
URL:
http://cgit.freedesktop.org/mesa/mesa/commit/?id=1019f0de1170f627e8e9ce7b449f7a76d89c6742
Author: Alan Hourihane al...@vmware.com
Date: Tue Jan 26 19:13:27 2010 +
only use -Werror flags with gcc 4.2.x and 4.3.x.
could use a better test here though.
---
scons/gallium.py | 10 --
1 files changed, 8 insertions(+), 2 deletions(-)
diff --git a/scons/gallium.py b/scons/gallium.py
index 24f88e1..1a095d8 100644
--- a/scons/gallium.py
+++ b/scons/gallium.py
@@ -268,16 +268,22 @@ def generate(env):
ccflags += [
'-Wall',
'-Wmissing-field-initializers',
-'-Werror=pointer-arith',
'-Wno-long-long',
'-ffast-math',
'-fmessage-length=0', # be nice to Eclipse
]
cflags += [
-'-Werror=declaration-after-statement',
'-Wmissing-prototypes',
'-std=gnu99',
]
+if env['CCVERSION'].startswith('4.2.') or
+ env['CCVERSION'].startswith('4.3.'):
+ ccflags += [
+ '-Werror=pointer-arith',
+ ]
+ cflags += [
+ '-Werror=declaration-after-statement',
+ ]
if msvc:
# See also:
# - http://msdn.microsoft.com/en-us/library/19z1t1wy.aspx
___
mesa-commit mailing list
mesa-commit@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/mesa-commit
Mesa (master): Allow the environment to override certain flags.
Module: Mesa
Branch: master
Commit: 6544be622363674430f70ca262629334d25b350a
URL:
http://cgit.freedesktop.org/mesa/mesa/commit/?id=6544be622363674430f70ca262629334d25b350a
Author: Alan Hourihane al...@vmware.com
Date: Tue Jan 26 19:14:16 2010 +
Allow the environment to override certain flags.
---
SConstruct | 11 +++
1 files changed, 11 insertions(+), 0 deletions(-)
diff --git a/SConstruct b/SConstruct
index ff06b9b..0770fe4 100644
--- a/SConstruct
+++ b/SConstruct
@@ -59,6 +59,17 @@ env = Environment(
ENV = os.environ,
)
+if os.environ.has_key('CC'):
+ env['CC'] = os.environ['CC']
+if os.environ.has_key('CFLAGS'):
+ env['CCFLAGS'] += SCons.Util.CLVar(os.environ['CFLAGS'])
+if os.environ.has_key('CXX'):
+ env['CXX'] = os.environ['CXX']
+if os.environ.has_key('CXXFLAGS'):
+ env['CXXFLAGS'] += SCons.Util.CLVar(os.environ['CXXFLAGS'])
+if os.environ.has_key('LDFLAGS'):
+ env['LINKFLAGS'] += SCons.Util.CLVar(os.environ['LDFLAGS'])
+
Help(opts.GenerateHelpText(env))
# replicate options values in local variables
___
mesa-commit mailing list
mesa-commit@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/mesa-commit
Mesa (master): fix typo
Module: Mesa
Branch: master
Commit: 18bb614acf3b9bbfd8c81253a6fd2fb24800dd70
URL:
http://cgit.freedesktop.org/mesa/mesa/commit/?id=18bb614acf3b9bbfd8c81253a6fd2fb24800dd70
Author: Alan Hourihane al...@vmware.com
Date: Tue Jan 26 19:18:32 2010 +
fix typo
---
scons/gallium.py |3 +--
1 files changed, 1 insertions(+), 2 deletions(-)
diff --git a/scons/gallium.py b/scons/gallium.py
index 1a095d8..5aa0b7b 100644
--- a/scons/gallium.py
+++ b/scons/gallium.py
@@ -276,8 +276,7 @@ def generate(env):
'-Wmissing-prototypes',
'-std=gnu99',
]
-if env['CCVERSION'].startswith('4.2.') or
- env['CCVERSION'].startswith('4.3.'):
+if env['CCVERSION'].startswith('4.2.') or
env['CCVERSION'].startswith('4.3.'):
ccflags += [
'-Werror=pointer-arith',
]
___
mesa-commit mailing list
mesa-commit@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/mesa-commit
Mesa (master): add missing SCons.Util
Module: Mesa Branch: master Commit: 550fc19a5f927b0a95e6aae96c64d094cffe1c36 URL: http://cgit.freedesktop.org/mesa/mesa/commit/?id=550fc19a5f927b0a95e6aae96c64d094cffe1c36 Author: Alan Hourihane al...@vmware.com Date: Tue Jan 26 19:57:34 2010 + add missing SCons.Util --- SConstruct |1 + 1 files changed, 1 insertions(+), 0 deletions(-) diff --git a/SConstruct b/SConstruct index 0770fe4..3a40244 100644 --- a/SConstruct +++ b/SConstruct @@ -23,6 +23,7 @@ import os import os.path import sys +import SCons.Util import common ___ mesa-commit mailing list mesa-commit@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/mesa-commit
Mesa (master): Check for __USE_MISC for defining uint ushort
Module: Mesa Branch: master Commit: 46f453b29890afebb49daa04e0dbeadc45e662c2 URL: http://cgit.freedesktop.org/mesa/mesa/commit/?id=46f453b29890afebb49daa04e0dbeadc45e662c2 Author: Alan Hourihane al...@vmware.com Date: Tue Jan 26 20:57:03 2010 + Check for __USE_MISC for defining uint ushort --- src/gallium/include/pipe/p_compiler.h |2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/src/gallium/include/pipe/p_compiler.h b/src/gallium/include/pipe/p_compiler.h index 272d030..6a9018a 100644 --- a/src/gallium/include/pipe/p_compiler.h +++ b/src/gallium/include/pipe/p_compiler.h @@ -63,7 +63,7 @@ #include stdbool.h -#ifndef __HAIKU__ +#if !defined(__HAIKU__) !defined(__USE_MISC) typedef unsigned int uint; typedef unsigned short ushort; #endif ___ mesa-commit mailing list mesa-commit@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/mesa-commit
Mesa (master): support an 'embedded' platform target which turns off most parts of the
Module: Mesa
Branch: master
Commit: dea98eb792b5a0637ff2067d9bfe2f666f01423e
URL:
http://cgit.freedesktop.org/mesa/mesa/commit/?id=dea98eb792b5a0637ff2067d9bfe2f666f01423e
Author: Alan Hourihane al...@vmware.com
Date: Tue Jan 26 20:58:11 2010 +
support an 'embedded' platform target which turns off most parts of the
build.
---
SConstruct | 13 +++--
common.py |3 +-
progs/SConscript | 71 ---
src/SConscript |5 ++-
src/gallium/SConscript |7 +++--
5 files changed, 54 insertions(+), 45 deletions(-)
diff --git a/SConstruct b/SConstruct
index 3a40244..3b8a9e0 100644
--- a/SConstruct
+++ b/SConstruct
@@ -38,6 +38,9 @@ if common.default_platform in ('linux', 'freebsd', 'darwin'):
elif common.default_platform in ('winddk',):
default_drivers = 'softpipe,svga,i915,i965,trace,identity'
default_winsys = 'all'
+elif common.default_platform in ('embedded',):
+ default_drivers = 'softpipe,llvmpipe'
+ default_winsys = 'xlib'
else:
default_drivers = 'all'
default_winsys = 'all'
@@ -83,7 +86,7 @@ platform = env['platform']
# derived options
x86 = machine == 'x86'
ppc = machine == 'ppc'
-gcc = platform in ('linux', 'freebsd', 'darwin')
+gcc = platform in ('linux', 'freebsd', 'darwin', 'embedded')
msvc = platform in ('windows', 'winddk')
Export([
@@ -114,7 +117,7 @@ if env['msvc']:
# Posix
-if platform in ('posix', 'linux', 'freebsd', 'darwin'):
+if platform in ('posix', 'linux', 'freebsd', 'darwin', 'embedded'):
env.Append(CPPDEFINES = [
'_POSIX_SOURCE',
('_POSIX_C_SOURCE', '199309L'),
@@ -132,9 +135,13 @@ if platform in ('posix', 'linux', 'freebsd', 'darwin'):
env.Append(LIBS = [
'm',
'pthread',
- 'expat',
'dl',
])
+ if platform != 'embedded':
+ env.Append(LIBS = [
+ 'expat',
+ ])
+
# DRI
diff --git a/common.py b/common.py
index 101fc55..928a449 100644
--- a/common.py
+++ b/common.py
@@ -59,9 +59,8 @@ def AddOptions(opts):
opts.Add(EnumOption('machine', 'use machine-specific assembly code',
default_machine,
allowed_values=('generic', 'ppc', 'x86', 'x86_64')))
opts.Add(EnumOption('platform', 'target platform', default_platform,
-
allowed_values=('linux', 'cell', 'windows', 'winddk', 'wince',
'darwin')))
+
allowed_values=('linux', 'cell', 'windows', 'winddk', 'wince',
'darwin', 'embedded')))
opts.Add(EnumOption('toolchain', 'compiler toolchain', 'default',
allowed_values=('default', 'crossmingw', 'winsdk', 'winddk')))
opts.Add(BoolOption('llvm', 'use LLVM', 'no'))
opts.Add(BoolOption('dri', 'build DRI drivers', default_dri))
-
diff --git a/progs/SConscript b/progs/SConscript
index 3b180d0..66a1745 100644
--- a/progs/SConscript
+++ b/progs/SConscript
@@ -15,38 +15,39 @@ if progs_env['platform'] == 'windows':
'gdi32',
])
-# OpenGL
-if progs_env['platform'] == 'windows':
-progs_env.Prepend(LIBS = ['glu32', 'opengl32'])
-else:
-progs_env.Prepend(LIBS = ['GLU', 'GL'])
-
-# Glut
-progs_env.Prepend(LIBS = [glut])
-
-# GLEW
-progs_env.Prepend(LIBS = [glew])
-
-progs_env.Prepend(CPPPATH = [
- '#progs/util',
-])
-
-progs_env.Prepend(LIBS = [
- util,
-])
-
-Export('progs_env')
-
-SConscript([
-'demos/SConscript',
-'glsl/SConscript',
-'redbook/SConscript',
-'samples/SConscript',
-'tests/SConscript',
-'trivial/SConscript',
-'vp/SConscript',
-'vpglsl/SConscript',
-'fp/SConscript',
-'wgl/SConscript',
-'perf/SConscript',
-])
+if platform != 'embedded':
+ # OpenGL
+ if progs_env['platform'] == 'windows':
+ progs_env.Prepend(LIBS = ['glu32', 'opengl32'])
+ else:
+ progs_env.Prepend(LIBS = ['GLU', 'GL'])
+
+ # Glut
+ progs_env.Prepend(LIBS = [glut])
+
+ # GLEW
+ progs_env.Prepend(LIBS = [glew])
+
+ progs_env.Prepend(CPPPATH = [
+ '#progs/util',
+ ])
+
+ progs_env.Prepend(LIBS = [
+ util,
+ ])
+
+ Export('progs_env')
+
+ SConscript([
+ 'demos/SConscript',
+ 'glsl/SConscript',
+ 'redbook/SConscript',
+ 'samples/SConscript',
+ 'tests/SConscript',
+ 'trivial/SConscript',
+ 'vp/SConscript',
+ 'vpglsl/SConscript',
+ 'fp/SConscript',
+ 'wgl/SConscript',
+ 'perf/SConscript
Mesa (master): Remove obsolete file
Module: Mesa Branch: master Commit: d88b219cf37c488f57e18850c843078ff918b55d URL: http://cgit.freedesktop.org/mesa/mesa/commit/?id=d88b219cf37c488f57e18850c843078ff918b55d Author: Alan Hourihane al...@vmware.com Date: Fri Jan 22 19:32:12 2010 + Remove obsolete file --- src/gallium/auxiliary/SConscript |1 - 1 files changed, 0 insertions(+), 1 deletions(-) diff --git a/src/gallium/auxiliary/SConscript b/src/gallium/auxiliary/SConscript index f957090..3aa782f 100644 --- a/src/gallium/auxiliary/SConscript +++ b/src/gallium/auxiliary/SConscript @@ -87,7 +87,6 @@ source = [ 'pipebuffer/pb_bufmgr_alt.c', 'pipebuffer/pb_bufmgr_cache.c', 'pipebuffer/pb_bufmgr_debug.c', -'pipebuffer/pb_bufmgr_fenced.c', 'pipebuffer/pb_bufmgr_mm.c', 'pipebuffer/pb_bufmgr_ondemand.c', 'pipebuffer/pb_bufmgr_pool.c', ___ mesa-commit mailing list mesa-commit@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/mesa-commit
Mesa (master): silence compiler warning
Module: Mesa Branch: master Commit: a3abb9d1cc4698e45e5d794919e8c27a3d7e5908 URL: http://cgit.freedesktop.org/mesa/mesa/commit/?id=a3abb9d1cc4698e45e5d794919e8c27a3d7e5908 Author: Alan Hourihane al...@vmware.com Date: Mon Jan 4 12:42:51 2010 + silence compiler warning --- src/gallium/drivers/llvmpipe/lp_tex_sample_c.c |4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) diff --git a/src/gallium/drivers/llvmpipe/lp_tex_sample_c.c b/src/gallium/drivers/llvmpipe/lp_tex_sample_c.c index 0d01c07..68520fa 100644 --- a/src/gallium/drivers/llvmpipe/lp_tex_sample_c.c +++ b/src/gallium/drivers/llvmpipe/lp_tex_sample_c.c @@ -1085,7 +1085,7 @@ lp_get_samples_2d_common(struct tgsi_sampler *tgsi_sampler, const struct pipe_sampler_state *sampler = samp-sampler; unsigned level0, level1, j, imgFilter; int width, height; - float levelBlend; + float levelBlend = 0.0f; choose_mipmap_levels(tgsi_sampler, s, t, p, lodbias, @@ -1241,7 +1241,7 @@ lp_get_samples_3d(struct tgsi_sampler *tgsi_sampler, /* get/map pipe_surfaces corresponding to 3D tex slices */ unsigned level0, level1, j, imgFilter; int width, height, depth; - float levelBlend; + float levelBlend = 0.0f; const uint face = 0; choose_mipmap_levels(tgsi_sampler, s, t, p, ___ mesa-commit mailing list mesa-commit@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/mesa-commit
Mesa (master): fix overflow
Module: Mesa
Branch: master
Commit: 1baaf111c8c42ed7f7218c46038f32eb51b9c6eb
URL:
http://cgit.freedesktop.org/mesa/mesa/commit/?id=1baaf111c8c42ed7f7218c46038f32eb51b9c6eb
Author: Alan Hourihane al...@vmware.com
Date: Mon Jan 4 17:41:49 2010 +
fix overflow
---
src/mesa/main/enums.c |2 +-
1 files changed, 1 insertions(+), 1 deletions(-)
diff --git a/src/mesa/main/enums.c b/src/mesa/main/enums.c
index 85197af..73d6e6a 100644
--- a/src/mesa/main/enums.c
+++ b/src/mesa/main/enums.c
@@ -3680,7 +3680,7 @@ static const enum_elt all_enums[1885] =
{ 37780, 0x2802 }, /* GL_TEXTURE_WRAP_S */
{ 37798, 0x2803 }, /* GL_TEXTURE_WRAP_T */
{ 37816, 0x911B }, /* GL_TIMEOUT_EXPIRED */
- { 37835, 0x }, /* GL_TIMEOUT_IGNORED */
+ { 37835, 0x }, /* GL_TIMEOUT_IGNORED */
{ 37854, 0x88BF }, /* GL_TIME_ELAPSED_EXT */
{ 37874, 0x8648 }, /* GL_TRACK_MATRIX_NV */
{ 37893, 0x8649 }, /* GL_TRACK_MATRIX_TRANSFORM_NV */
___
mesa-commit mailing list
mesa-commit@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/mesa-commit
Mesa (master): move assert to avoid crash in debug build.
Module: Mesa
Branch: master
Commit: 2aebc5e01fbab6046f80c881d30717f788a390bc
URL:
http://cgit.freedesktop.org/mesa/mesa/commit/?id=2aebc5e01fbab6046f80c881d30717f788a390bc
Author: Alan Hourihane al...@vmware.com
Date: Tue Dec 8 13:11:09 2009 +
move assert to avoid crash in debug build.
---
src/gallium/drivers/llvmpipe/lp_tile_cache.c |3 ++-
1 files changed, 2 insertions(+), 1 deletions(-)
diff --git a/src/gallium/drivers/llvmpipe/lp_tile_cache.c
b/src/gallium/drivers/llvmpipe/lp_tile_cache.c
index e83210f..7a1ecf5 100644
--- a/src/gallium/drivers/llvmpipe/lp_tile_cache.c
+++ b/src/gallium/drivers/llvmpipe/lp_tile_cache.c
@@ -290,11 +290,12 @@ lp_get_cached_tile(struct llvmpipe_tile_cache *tc,
assert(tc-surface);
assert(tc-transfer);
- assert(tc-transfer_map);
if(!tc-transfer_map)
lp_tile_cache_map_transfers(tc);
+ assert(tc-transfer_map);
+
switch(tile-status) {
case LP_TILE_STATUS_CLEAR:
/* don't get tile from framebuffer, just clear it */
___
mesa-commit mailing list
mesa-commit@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/mesa-commit
Re: Mesa (master): st/xorg: Fix comp alpha code and deal with luminance masks
On Mon, 2009-11-16 at 14:36 -0800, Jakob Bornecrantz wrote:
Module: Mesa
Branch: master
Commit: cb060f3b987c9fa07ebe06cf2e7e54d1eaded1e1
URL:
http://cgit.freedesktop.org/mesa/mesa/commit/?id=cb060f3b987c9fa07ebe06cf2e7e54d1eaded1e1
Author: Jakob Bornecrantz ja...@vmware.com
Date: Mon Nov 16 22:57:43 2009 +0100
st/xorg: Fix comp alpha code and deal with luminance masks
There are two fixes in here one is a one liner that fixes
component alpha logic. The other deals better with luminance
formats used for masks, sources not yet implemented.
Fixes component alpha text and icons in gnome. There are a one
or two cases that this code misses. Like if src_luminance is set
but no mask image is given.
---
src/gallium/state_trackers/xorg/xorg_composite.c |5 ++-
src/gallium/state_trackers/xorg/xorg_exa.c |3 +
src/gallium/state_trackers/xorg/xorg_exa_tgsi.c | 58
--
src/gallium/state_trackers/xorg/xorg_exa_tgsi.h |2 +
4 files changed, 62 insertions(+), 6 deletions(-)
diff --git a/src/gallium/state_trackers/xorg/xorg_composite.c
b/src/gallium/state_trackers/xorg/xorg_composite.c
index 1ff19a2..93a3e1b 100644
--- a/src/gallium/state_trackers/xorg/xorg_composite.c
+++ b/src/gallium/state_trackers/xorg/xorg_composite.c
@@ -235,8 +235,11 @@ picture_format_fixups(struct exa_pixmap_priv *pSrc,
PicturePtr pSrcPicture, bool
boolean swizzle = FALSE;
unsigned ret = 0;
- if (pSrc-picture_format == pSrcPicture-format)
+ if (pSrc-picture_format == pSrcPicture-format) {
+ if (pSrc-picture_format == PICT_a8)
+ return mask ? FS_MASK_LUMINANCE : FS_MASK_LUMINANCE;
return 0;
+ }
Mmm,
I guess this should say
return mask ? FS_MASK_LUMINANCE : FS_SET_LUMINANCE;
???
Alan.
___
mesa-commit mailing list
mesa-commit@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/mesa-commit
Re: Mesa (master): st/xorg: Fix comp alpha code and deal with luminance masks
On Mon, 2009-11-16 at 22:44 +, Alan Hourihane wrote:
On Mon, 2009-11-16 at 14:36 -0800, Jakob Bornecrantz wrote:
Module: Mesa
Branch: master
Commit: cb060f3b987c9fa07ebe06cf2e7e54d1eaded1e1
URL:
http://cgit.freedesktop.org/mesa/mesa/commit/?id=cb060f3b987c9fa07ebe06cf2e7e54d1eaded1e1
Author: Jakob Bornecrantz ja...@vmware.com
Date: Mon Nov 16 22:57:43 2009 +0100
st/xorg: Fix comp alpha code and deal with luminance masks
There are two fixes in here one is a one liner that fixes
component alpha logic. The other deals better with luminance
formats used for masks, sources not yet implemented.
Fixes component alpha text and icons in gnome. There are a one
or two cases that this code misses. Like if src_luminance is set
but no mask image is given.
---
src/gallium/state_trackers/xorg/xorg_composite.c |5 ++-
src/gallium/state_trackers/xorg/xorg_exa.c |3 +
src/gallium/state_trackers/xorg/xorg_exa_tgsi.c | 58
--
src/gallium/state_trackers/xorg/xorg_exa_tgsi.h |2 +
4 files changed, 62 insertions(+), 6 deletions(-)
diff --git a/src/gallium/state_trackers/xorg/xorg_composite.c
b/src/gallium/state_trackers/xorg/xorg_composite.c
index 1ff19a2..93a3e1b 100644
--- a/src/gallium/state_trackers/xorg/xorg_composite.c
+++ b/src/gallium/state_trackers/xorg/xorg_composite.c
@@ -235,8 +235,11 @@ picture_format_fixups(struct exa_pixmap_priv *pSrc,
PicturePtr pSrcPicture, bool
boolean swizzle = FALSE;
unsigned ret = 0;
- if (pSrc-picture_format == pSrcPicture-format)
+ if (pSrc-picture_format == pSrcPicture-format) {
+ if (pSrc-picture_format == PICT_a8)
+ return mask ? FS_MASK_LUMINANCE : FS_MASK_LUMINANCE;
return 0;
+ }
Mmm,
I guess this should say
return mask ? FS_MASK_LUMINANCE : FS_SET_LUMINANCE;
Whoops. Not _SET_, but _SRC_ ??
Alan.
___
mesa-commit mailing list
mesa-commit@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/mesa-commit
Mesa (master): Fix memory leak.
Module: Mesa Branch: master Commit: a24631bcd7ab2cbc6fff2a536502a07a13a9bc83 URL: http://cgit.freedesktop.org/mesa/mesa/commit/?id=a24631bcd7ab2cbc6fff2a536502a07a13a9bc83 Author: Alan Hourihane al...@vmware.com Date: Fri Nov 20 18:08:29 2009 + Fix memory leak. --- src/gallium/drivers/softpipe/sp_state_fs.c |1 + 1 files changed, 1 insertions(+), 0 deletions(-) diff --git a/src/gallium/drivers/softpipe/sp_state_fs.c b/src/gallium/drivers/softpipe/sp_state_fs.c index 256faa9..b41f7e8 100644 --- a/src/gallium/drivers/softpipe/sp_state_fs.c +++ b/src/gallium/drivers/softpipe/sp_state_fs.c @@ -143,6 +143,7 @@ softpipe_delete_vs_state(struct pipe_context *pipe, void *vs) struct sp_vertex_shader *state = (struct sp_vertex_shader *) vs; draw_delete_vertex_shader(softpipe-draw, state-draw_data); + FREE( (void *)state-shader.tokens ); FREE( state ); } ___ mesa-commit mailing list mesa-commit@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/mesa-commit
Mesa (master): Fix indentation.
Module: Mesa
Branch: master
Commit: 904469dcd2e50d950c5e061103907da659053ff2
URL:
http://cgit.freedesktop.org/mesa/mesa/commit/?id=904469dcd2e50d950c5e061103907da659053ff2
Author: Alan Hourihane al...@vmware.com
Date: Fri Nov 20 18:10:54 2009 +
Fix indentation.
---
src/gallium/drivers/softpipe/sp_context.c |7 ---
1 files changed, 4 insertions(+), 3 deletions(-)
diff --git a/src/gallium/drivers/softpipe/sp_context.c
b/src/gallium/drivers/softpipe/sp_context.c
index 5f60139..bdbb7fa 100644
--- a/src/gallium/drivers/softpipe/sp_context.c
+++ b/src/gallium/drivers/softpipe/sp_context.c
@@ -90,14 +90,15 @@ softpipe_destroy( struct pipe_context *pipe )
if (softpipe-draw)
draw_destroy( softpipe-draw );
- softpipe-quad.shade-destroy( softpipe-quad.shade );
- softpipe-quad.depth_test-destroy( softpipe-quad.depth_test );
- softpipe-quad.blend-destroy( softpipe-quad.blend );
+ softpipe-quad.shade-destroy( softpipe-quad.shade );
+ softpipe-quad.depth_test-destroy( softpipe-quad.depth_test );
+ softpipe-quad.blend-destroy( softpipe-quad.blend );
for (i = 0; i PIPE_MAX_COLOR_BUFS; i++) {
sp_destroy_tile_cache(softpipe-cbuf_cache[i]);
pipe_surface_reference(softpipe-framebuffer.cbufs[i], NULL);
}
+
sp_destroy_tile_cache(softpipe-zsbuf_cache);
pipe_surface_reference(softpipe-framebuffer.zsbuf, NULL);
___
mesa-commit mailing list
mesa-commit@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/mesa-commit
Mesa (mesa_7_7_branch): Fix memory leak.
Module: Mesa Branch: mesa_7_7_branch Commit: 1dbf3642b9c1c37f72e2212ce78056cf8959a957 URL: http://cgit.freedesktop.org/mesa/mesa/commit/?id=1dbf3642b9c1c37f72e2212ce78056cf8959a957 Author: Alan Hourihane al...@vmware.com Date: Fri Nov 20 18:08:29 2009 + Fix memory leak. --- src/gallium/drivers/softpipe/sp_state_fs.c |1 + 1 files changed, 1 insertions(+), 0 deletions(-) diff --git a/src/gallium/drivers/softpipe/sp_state_fs.c b/src/gallium/drivers/softpipe/sp_state_fs.c index 256faa9..b41f7e8 100644 --- a/src/gallium/drivers/softpipe/sp_state_fs.c +++ b/src/gallium/drivers/softpipe/sp_state_fs.c @@ -143,6 +143,7 @@ softpipe_delete_vs_state(struct pipe_context *pipe, void *vs) struct sp_vertex_shader *state = (struct sp_vertex_shader *) vs; draw_delete_vertex_shader(softpipe-draw, state-draw_data); + FREE( (void *)state-shader.tokens ); FREE( state ); } ___ mesa-commit mailing list mesa-commit@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/mesa-commit
Mesa (mesa_7_7_branch): Fix vega compilation.
Module: Mesa
Branch: mesa_7_7_branch
Commit: 910b58039a3980d9857380cf367bdbe2395d791f
URL:
http://cgit.freedesktop.org/mesa/mesa/commit/?id=910b58039a3980d9857380cf367bdbe2395d791f
Author: Alan Hourihane al...@vmware.com
Date: Fri Nov 20 18:09:10 2009 +
Fix vega compilation.
---
src/gallium/state_trackers/vega/arc.c|6 --
src/gallium/state_trackers/vega/bezier.c |7 +--
src/gallium/state_trackers/vega/vg_context.c |4 +++-
3 files changed, 12 insertions(+), 5 deletions(-)
diff --git a/src/gallium/state_trackers/vega/arc.c
b/src/gallium/state_trackers/vega/arc.c
index e74c7f0..8b04d21 100644
--- a/src/gallium/state_trackers/vega/arc.c
+++ b/src/gallium/state_trackers/vega/arc.c
@@ -528,6 +528,7 @@ static INLINE int num_beziers_needed(struct arc *arc)
double threshold = 0.05;
VGboolean found = VG_FALSE;
int n = 1;
+ int i;
double min_eta, max_eta;
min_eta = MIN2(arc-eta1, arc-eta2);
@@ -538,7 +539,7 @@ static INLINE int num_beziers_needed(struct arc *arc)
if (d_eta = 0.5 * M_PI) {
double eta_b = min_eta;
found = VG_TRUE;
- for (int i = 0; found (i n); ++i) {
+ for (i = 0; found (i n); ++i) {
double etaA = eta_b;
eta_b += d_eta;
found = (estimate_error(arc, etaA, eta_b) = threshold);
@@ -554,6 +555,7 @@ static void arc_to_beziers(struct arc *arc,
struct arc_cb cb,
struct matrix *matrix)
{
+ int i;
int n = 1;
double d_eta, eta_b, cos_eta_b,
sin_eta_b, a_cos_eta_b, b_sin_eta_b, a_sin_eta_b,
@@ -607,7 +609,7 @@ static void arc_to_beziers(struct arc *arc,
t = tan(0.5 * d_eta);
alpha = sin(d_eta) * (sqrt(4 + 3 * t * t) - 1) / 3;
- for (int i = 0; i n; ++i) {
+ for (i = 0; i n; ++i) {
struct bezier bezier;
double xA= x_b;
double yA= y_b;
diff --git a/src/gallium/state_trackers/vega/bezier.c
b/src/gallium/state_trackers/vega/bezier.c
index 39a7ade..0d55040 100644
--- a/src/gallium/state_trackers/vega/bezier.c
+++ b/src/gallium/state_trackers/vega/bezier.c
@@ -255,7 +255,9 @@ static enum shift_result good_offset(const struct bezier
*b1,
const float max_dist_line = threshold*offset*offset;
const float max_dist_normal = threshold*offset;
const float spacing = 0.25;
- for (float i = spacing; i 0.99; i += spacing) {
+ float i;
+
+ for (i = spacing; i 0.99; i += spacing) {
float p1[2],p2[2], d, l;
float normal[2];
bezier_point_at(b1, i, p1);
@@ -330,6 +332,7 @@ static enum shift_result shift(const struct bezier *orig,
struct bezier *shifted,
float offset, float threshold)
{
+ int i;
int map[4];
VGboolean p1_p2_equal = (orig-x1 == orig-x2 orig-y1 == orig-y2);
VGboolean p2_p3_equal = (orig-x2 == orig-x3 orig-y2 == orig-y3);
@@ -404,7 +407,7 @@ static enum shift_result shift(const struct bezier *orig,
points_shifted[0][0] = points[0][0] + offset * prev_normal[0];
points_shifted[0][1] = points[0][1] + offset * prev_normal[1];
- for (int i = 1; i np - 1; ++i) {
+ for (i = 1; i np - 1; ++i) {
float normal_sum[2], r;
float next_normal[2];
compute_pt_normal(points[i], points[i + 1], next_normal);
diff --git a/src/gallium/state_trackers/vega/vg_context.c
b/src/gallium/state_trackers/vega/vg_context.c
index e0ff02f..00d23f5 100644
--- a/src/gallium/state_trackers/vega/vg_context.c
+++ b/src/gallium/state_trackers/vega/vg_context.c
@@ -231,6 +231,8 @@ static void update_clip_state(struct vg_context *ctx)
if (state-scissoring) {
struct pipe_blend_state *blend = ctx-state.g3d.blend;
struct pipe_framebuffer_state *fb = ctx-state.g3d.fb;
+ int i;
+
dsa-depth.writemask = 1;/*glDepthMask(TRUE);*/
dsa-depth.func = PIPE_FUNC_ALWAYS;
dsa-depth.enabled = 1;
@@ -254,7 +256,7 @@ static void update_clip_state(struct vg_context *ctx)
cso_set_blend(ctx-cso_context, blend);
/* enable scissoring */
- for (int i = 0; i state-scissor_rects_num; ++i) {
+ for (i = 0; i state-scissor_rects_num; ++i) {
const float x = state-scissor_rects[i * 4 + 0].f;
const float y = state-scissor_rects[i * 4 + 1].f;
const float width = state-scissor_rects[i * 4 + 2].f;
___
mesa-commit mailing list
mesa-commit@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/mesa-commit
Mesa (master): Fix YTILE spantmp functions
Module: Mesa Branch: master Commit: 3040b2ee9dcb5fcf7660ae8ee2cd3f7d86e7da47 URL: http://cgit.freedesktop.org/mesa/mesa/commit/?id=3040b2ee9dcb5fcf7660ae8ee2cd3f7d86e7da47 Author: Alan Hourihane al...@vmware.com Date: Wed Nov 4 14:48:25 2009 + Fix YTILE spantmp functions --- src/mesa/drivers/dri/intel/intel_spantmp.h |4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) diff --git a/src/mesa/drivers/dri/intel/intel_spantmp.h b/src/mesa/drivers/dri/intel/intel_spantmp.h index 98cc658..bad0339 100644 --- a/src/mesa/drivers/dri/intel/intel_spantmp.h +++ b/src/mesa/drivers/dri/intel/intel_spantmp.h @@ -54,8 +54,8 @@ #define SPANTMP_PIXEL_FMT INTEL_PIXEL_FMT #define SPANTMP_PIXEL_TYPE INTEL_PIXEL_TYPE -#define PUT_VALUE(_x, _y, v) INTEL_WRITE_VALUE(X_TILE(_x, _y), v) -#define GET_VALUE(_x, _y) INTEL_READ_VALUE(X_TILE(_x, _y)) +#define PUT_VALUE(_x, _y, v) INTEL_WRITE_VALUE(Y_TILE(_x, _y), v) +#define GET_VALUE(_x, _y) INTEL_READ_VALUE(Y_TILE(_x, _y)) #define TAG(x) INTEL_TAG(intel_YTile_##x) #define TAG2(x, y) INTEL_TAG(intel_YTile_##x)##y #include spantmp2.h ___ mesa-commit mailing list mesa-commit@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/mesa-commit
Mesa (mesa_7_6_branch): Fix YTILE spantmp functions
Module: Mesa Branch: mesa_7_6_branch Commit: f1b91ccc0839f5088b86c3fe81eed957c1f91293 URL: http://cgit.freedesktop.org/mesa/mesa/commit/?id=f1b91ccc0839f5088b86c3fe81eed957c1f91293 Author: Alan Hourihane al...@vmware.com Date: Wed Nov 4 14:48:25 2009 + Fix YTILE spantmp functions --- src/mesa/drivers/dri/intel/intel_spantmp.h |4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) diff --git a/src/mesa/drivers/dri/intel/intel_spantmp.h b/src/mesa/drivers/dri/intel/intel_spantmp.h index ead0b1c..35df969 100644 --- a/src/mesa/drivers/dri/intel/intel_spantmp.h +++ b/src/mesa/drivers/dri/intel/intel_spantmp.h @@ -48,8 +48,8 @@ #define SPANTMP_PIXEL_FMT INTEL_PIXEL_FMT #define SPANTMP_PIXEL_TYPE INTEL_PIXEL_TYPE -#define PUT_VALUE(_x, _y, v) INTEL_WRITE_VALUE(X_TILE(_x, _y), v) -#define GET_VALUE(_x, _y) INTEL_READ_VALUE(X_TILE(_x, _y)) +#define PUT_VALUE(_x, _y, v) INTEL_WRITE_VALUE(Y_TILE(_x, _y), v) +#define GET_VALUE(_x, _y) INTEL_READ_VALUE(Y_TILE(_x, _y)) #define TAG(x) INTEL_TAG(intel_YTile_##x) #define TAG2(x, y) INTEL_TAG(intel_YTile_##x)##y #include spantmp2.h ___ mesa-commit mailing list mesa-commit@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/mesa-commit
Mesa (master): Ensure GL_EXT_blend_equation_separate is enabled when 2. 0 is enabled.
Module: Mesa Branch: master Commit: 45b12edcbe2c112a87993f810f832a9141085b17 URL: http://cgit.freedesktop.org/mesa/mesa/commit/?id=45b12edcbe2c112a87993f810f832a9141085b17 Author: Alan Hourihane al...@jetpack.(none) Date: Thu Aug 6 15:54:49 2009 +0100 Ensure GL_EXT_blend_equation_separate is enabled when 2.0 is enabled. --- src/mesa/main/extensions.c |1 + 1 files changed, 1 insertions(+), 0 deletions(-) diff --git a/src/mesa/main/extensions.c b/src/mesa/main/extensions.c index c60b58a..6f683d2 100644 --- a/src/mesa/main/extensions.c +++ b/src/mesa/main/extensions.c @@ -413,6 +413,7 @@ _mesa_enable_2_0_extensions(GLcontext *ctx) ctx-Extensions.ARB_fragment_shader = GL_TRUE; #endif ctx-Extensions.ARB_point_sprite = GL_TRUE; + ctx-Extensions.EXT_blend_equation_separate = GL_TRUE; ctx-Extensions.ARB_texture_non_power_of_two = GL_TRUE; #if FEATURE_ARB_shader_objects ctx-Extensions.ARB_shader_objects = GL_TRUE; ___ mesa-commit mailing list mesa-commit@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/mesa-commit
Mesa (mesa_7_5_branch): Ensure GL_EXT_blend_equation_separate is enabled when 2.0 is enabled.
Module: Mesa Branch: mesa_7_5_branch Commit: 8c223e8eb6359d5df918e23ae5c036fa134cc40d URL: http://cgit.freedesktop.org/mesa/mesa/commit/?id=8c223e8eb6359d5df918e23ae5c036fa134cc40d Author: Alan Hourihane al...@jetpack.(none) Date: Thu Aug 6 15:54:49 2009 +0100 Ensure GL_EXT_blend_equation_separate is enabled when 2.0 is enabled. --- src/mesa/main/extensions.c |1 + 1 files changed, 1 insertions(+), 0 deletions(-) diff --git a/src/mesa/main/extensions.c b/src/mesa/main/extensions.c index 5c4bea9..ebbe28a 100644 --- a/src/mesa/main/extensions.c +++ b/src/mesa/main/extensions.c @@ -404,6 +404,7 @@ _mesa_enable_2_0_extensions(GLcontext *ctx) ctx-Extensions.ARB_fragment_shader = GL_TRUE; #endif ctx-Extensions.ARB_point_sprite = GL_TRUE; + ctx-Extensions.EXT_blend_equation_separate = GL_TRUE; ctx-Extensions.ARB_texture_non_power_of_two = GL_TRUE; #if FEATURE_ARB_shader_objects ctx-Extensions.ARB_shader_objects = GL_TRUE; ___ mesa-commit mailing list mesa-commit@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/mesa-commit
Mesa (gallium-mesa-7.4): add patches from bug 21997
Module: Mesa
Branch: gallium-mesa-7.4
Commit: ae22ad765843c19d4c853277416a6d52d9918c83
URL:
http://cgit.freedesktop.org/mesa/mesa/commit/?id=ae22ad765843c19d4c853277416a6d52d9918c83
Author: Alan Hourihane al...@vmware.com
Date: Mon Jun 15 15:59:57 2009 +0100
add patches from bug 21997
---
src/gallium/auxiliary/util/u_linear.c | 63 +---
src/gallium/auxiliary/util/u_linear.h | 11 ++-
src/gallium/include/pipe/p_defines.h | 10 ++
src/gallium/include/pipe/p_screen.h | 17 ++
src/gallium/include/pipe/p_state.h| 22 +++
src/mesa/state_tracker/st_cb_readpixels.c | 252 -
6 files changed, 346 insertions(+), 29 deletions(-)
diff --git a/src/gallium/auxiliary/util/u_linear.c
b/src/gallium/auxiliary/util/u_linear.c
index ff7645a..34a7ff3 100644
--- a/src/gallium/auxiliary/util/u_linear.c
+++ b/src/gallium/auxiliary/util/u_linear.c
@@ -6,23 +6,27 @@ void
pipe_linear_to_tile(size_t src_stride, void *src_ptr,
struct pipe_tile_info *t, void *dst_ptr)
{
- unsigned x, y, z;
- char *ptr;
+ unsigned x, y, offset;
+ char *ptr, *dst;
+ unsigned rows = t-rows, cols = t-cols;
size_t bytes = t-cols * t-block.size;
assert(pipe_linear_check_tile(t));
/* lets write lineary to the tiled buffer */
- for (y = 0; y t-tiles_y; y++) {
- for (x = 0; x t-tiles_x; x++) {
-/* this inner loop could be replace with SSE magic */
-ptr = (char*)src_ptr + src_stride * t-rows * y + bytes * x;
-for (z = 0; z t-rows; z++) {
- memcpy(dst_ptr, ptr, bytes);
- dst_ptr = (char *)dst_ptr + bytes;
- ptr += src_stride;
-}
+ for (x = t-left; x t-right; x += cols) {
+ cols = t-cols - x % t-cols;
+ if (x + cols t-right)
+ cols = t-right - x;
+ ptr = (char*)src_ptr + (x - t-left) * t-block.size;
+ offset = x / t-cols * t-tile.size + (x % t-cols) * t-block.size;
+ for (y = t-top; y t-bottom; y++) {
+ dst = (char*)dst_ptr + offset
++ y / t-rows * t-stride * t-rows
++ (y % t-rows) * bytes;
+ memcpy(dst, ptr, cols * t-block.size);
+ ptr += src_stride;
}
}
}
@@ -30,20 +34,24 @@ pipe_linear_to_tile(size_t src_stride, void *src_ptr,
void pipe_linear_from_tile(struct pipe_tile_info *t, void *src_ptr,
size_t dst_stride, void *dst_ptr)
{
- unsigned x, y, z;
- char *ptr;
+ unsigned x, y, offset;
+ unsigned rows = t-rows, cols = t-cols;
+ char *ptr, *src;
size_t bytes = t-cols * t-block.size;
- /* lets read lineary from the tiled buffer */
- for (y = 0; y t-tiles_y; y++) {
- for (x = 0; x t-tiles_x; x++) {
-/* this inner loop could be replace with SSE magic */
-ptr = (char*)dst_ptr + dst_stride * t-rows * y + bytes * x;
-for (z = 0; z t-rows; z++) {
- memcpy(ptr, src_ptr, bytes);
- src_ptr = (char *)src_ptr + bytes;
- ptr += dst_stride;
-}
+ /* lets write lineary to the tiled buffer */
+ for (x = t-left; x t-right; x += cols) {
+ cols = t-cols - x % t-cols;
+ if (x + cols t-right)
+ cols = t-right - x;
+ ptr = (char*)dst_ptr + (x - t-left) * t-block.size;
+ offset = x / t-cols * t-tile.size + (x % t-cols) * t-block.size;
+ for (y = t-top; y t-bottom; y++) {
+ src = (char*)src_ptr + offset
++ y / t-rows * t-stride * t-rows
++ (y % t-rows) * bytes;
+ memcpy(ptr, src, cols * t-block.size);
+ ptr += dst_stride;
}
}
}
@@ -52,7 +60,9 @@ void
pipe_linear_fill_info(struct pipe_tile_info *t,
struct pipe_format_block *block,
unsigned tile_width, unsigned tile_height,
- unsigned tiles_x, unsigned tiles_y)
+ unsigned tiles_x, unsigned tiles_y,
+ unsigned left, unsigned top,
+ unsigned right, unsigned bottom)
{
t-block = *block;
@@ -66,4 +76,9 @@ pipe_linear_fill_info(struct pipe_tile_info *t,
t-tiles_y = tiles_y;
t-stride = t-cols * t-tiles_x * t-block.size;
t-size = t-tiles_x * t-tiles_y * t-tile.size;
+
+ t-left = left;
+ t-top = top;
+ t-right = right;
+ t-bottom = bottom;
}
diff --git a/src/gallium/auxiliary/util/u_linear.h
b/src/gallium/auxiliary/util/u_linear.h
index e337cfd..c213d37 100644
--- a/src/gallium/auxiliary/util/u_linear.h
+++ b/src/gallium/auxiliary/util/u_linear.h
@@ -12,6 +12,12 @@ struct pipe_tile_info
unsigned tiles_x;
unsigned tiles_y;
+ /* The region to be converted */
+ unsigned left;
+ unsigned top;
+ unsigned right;
+ unsigned bottom;
+
/* size of each tile expressed in blocks */
unsigned cols;
unsigned rows;
@@ -37,11 +43,14 @@ void pipe_linear_from_tile(struct pipe_tile_info *t, void
*src_ptr,
* @tile_height the height of the tile in pixels
Mesa (gallium-mesa-7.4): st: fix crash when using accum_mad()
Module: Mesa
Branch: gallium-mesa-7.4
Commit: 699162286de9a6bf7bdae5f2fc9104fd5e8d8a34
URL:
http://cgit.freedesktop.org/mesa/mesa/commit/?id=699162286de9a6bf7bdae5f2fc9104fd5e8d8a34
Author: Alan Hourihane al...@vmware.com
Date: Tue May 12 12:40:53 2009 +0100
st: fix crash when using accum_mad()
---
src/mesa/state_tracker/st_cb_accum.c |5 -
1 files changed, 4 insertions(+), 1 deletions(-)
diff --git a/src/mesa/state_tracker/st_cb_accum.c
b/src/mesa/state_tracker/st_cb_accum.c
index a4e72b4..1ddc628 100644
--- a/src/mesa/state_tracker/st_cb_accum.c
+++ b/src/mesa/state_tracker/st_cb_accum.c
@@ -160,7 +160,10 @@ accum_mad(GLcontext *ctx, GLfloat scale, GLfloat bias,
struct st_renderbuffer *acc_strb)
{
struct pipe_screen *screen = ctx-st-pipe-screen;
- struct pipe_surface *acc_ps = acc_strb-surface;
+// struct pipe_surface *acc_ps = acc_strb-surface;
+ struct pipe_surface *acc_ps = screen-get_tex_surface(screen,
acc_strb-texture, 0, 0, 0,
+ (PIPE_BUFFER_USAGE_CPU_WRITE |
+ PIPE_BUFFER_USAGE_CPU_READ));
GLubyte *map;
map = screen-surface_map(screen, acc_ps,
___
mesa-commit mailing list
mesa-commit@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/mesa-commit
Mesa (gallium-mesa-7.4): egl: use the GLX wrapper by default.
Module: Mesa
Branch: gallium-mesa-7.4
Commit: ab32cd256a7ef5f9eaf2a4871507ae2fc570226e
URL:
http://cgit.freedesktop.org/mesa/mesa/commit/?id=ab32cd256a7ef5f9eaf2a4871507ae2fc570226e
Author: Alan Hourihane al...@vmware.com
Date: Thu May 7 17:31:16 2009 +0100
egl: use the GLX wrapper by default.
---
src/egl/main/eglx.c |5 +
1 files changed, 1 insertions(+), 4 deletions(-)
diff --git a/src/egl/main/eglx.c b/src/egl/main/eglx.c
index 5a42fd2..df21aa2 100644
--- a/src/egl/main/eglx.c
+++ b/src/egl/main/eglx.c
@@ -79,10 +79,7 @@ _xeglChooseDriver(_EGLDisplay *dpy)
screen = DefaultScreen(dpy-Xdpy);
- /* See if we can choose a DRI/DRM driver */
- driverName = _eglChooseDRMDriver(screen);
- if (driverName !getenv(EGL_SOFTPIPE)) {
- free((void *) driverName);
+ if (!getenv(EGL_SOFTPIPE)) {
driverName = _eglstrdup(DefaultGLXDriver);
}
else {
___
mesa-commit mailing list
mesa-commit@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/mesa-commit
Mesa (master): demos: ensure display lists are destroyed for next generation
Module: Mesa Branch: master Commit: b2a69ae879a3ddb1f0ca1ea184ba24587cf25786 URL: http://cgit.freedesktop.org/mesa/mesa/commit/?id=b2a69ae879a3ddb1f0ca1ea184ba24587cf25786 Author: Alan Hourihane al...@vmware.com Date: Fri Apr 24 16:44:58 2009 +0100 demos: ensure display lists are destroyed for next generation --- progs/xdemos/glxcontexts.c |4 1 files changed, 4 insertions(+), 0 deletions(-) diff --git a/progs/xdemos/glxcontexts.c b/progs/xdemos/glxcontexts.c index a9ff326..a97b62a 100644 --- a/progs/xdemos/glxcontexts.c +++ b/progs/xdemos/glxcontexts.c @@ -385,6 +385,10 @@ draw( Display *dpy, Window win ) } else do_draw(); + glDeleteLists(gear1, 1); + glDeleteLists(gear2, 1); + glDeleteLists(gear3, 1); + glXSwapBuffers(dpy, win); glXDestroyContext(dpy, ctx); } ___ mesa-commit mailing list mesa-commit@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/mesa-commit
Mesa (mesa_7_4_branch): demos: ensure display lists are destroyed for next generation
Module: Mesa Branch: mesa_7_4_branch Commit: bfd6bb31a6bc162413cecd23b69389fa930cbf56 URL: http://cgit.freedesktop.org/mesa/mesa/commit/?id=bfd6bb31a6bc162413cecd23b69389fa930cbf56 Author: Alan Hourihane al...@vmware.com Date: Fri Apr 24 16:44:58 2009 +0100 demos: ensure display lists are destroyed for next generation --- progs/xdemos/glxcontexts.c |4 1 files changed, 4 insertions(+), 0 deletions(-) diff --git a/progs/xdemos/glxcontexts.c b/progs/xdemos/glxcontexts.c index a9ff326..a97b62a 100644 --- a/progs/xdemos/glxcontexts.c +++ b/progs/xdemos/glxcontexts.c @@ -385,6 +385,10 @@ draw( Display *dpy, Window win ) } else do_draw(); + glDeleteLists(gear1, 1); + glDeleteLists(gear2, 1); + glDeleteLists(gear3, 1); + glXSwapBuffers(dpy, win); glXDestroyContext(dpy, ctx); } ___ mesa-commit mailing list mesa-commit@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/mesa-commit
Mesa (gallium-mesa-7.4): intel: make sure polygon mode is set properly in intel_clear_tris()
Module: Mesa
Branch: gallium-mesa-7.4
Commit: 69b17abd6bd969f90ed2a86b898dcb13efe13878
URL:
http://cgit.freedesktop.org/mesa/mesa/commit/?id=69b17abd6bd969f90ed2a86b898dcb13efe13878
Author: Brian Paul bri...@vmware.com
Date: Fri Apr 17 16:14:39 2009 -0600
intel: make sure polygon mode is set properly in intel_clear_tris()
Fixes progs/glsl/skinning.c demo.
(cherry picked from master, commit 794d488e6dc795c225505b8c00a7f00f1960a5ad)
---
src/mesa/drivers/dri/intel/intel_clear.c |2 ++
1 files changed, 2 insertions(+), 0 deletions(-)
diff --git a/src/mesa/drivers/dri/intel/intel_clear.c
b/src/mesa/drivers/dri/intel/intel_clear.c
index c3ba50f..044e9d3 100644
--- a/src/mesa/drivers/dri/intel/intel_clear.c
+++ b/src/mesa/drivers/dri/intel/intel_clear.c
@@ -93,6 +93,7 @@ intel_clear_tris(GLcontext *ctx, GLbitfield mask)
GL_CURRENT_BIT |
GL_DEPTH_BUFFER_BIT |
GL_ENABLE_BIT |
+ GL_POLYGON_BIT |
GL_STENCIL_BUFFER_BIT |
GL_TRANSFORM_BIT |
GL_CURRENT_BIT);
@@ -114,6 +115,7 @@ intel_clear_tris(GLcontext *ctx, GLbitfield mask)
_mesa_Disable(GL_CLIP_PLANE3);
_mesa_Disable(GL_CLIP_PLANE4);
_mesa_Disable(GL_CLIP_PLANE5);
+ _mesa_PolygonMode(GL_FRONT_AND_BACK, GL_FILL);
if (ctx-Extensions.ARB_fragment_program ctx-FragmentProgram.Enabled) {
saved_fp_enable = GL_TRUE;
_mesa_Disable(GL_FRAGMENT_PROGRAM_ARB);
___
mesa-commit mailing list
mesa-commit@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/mesa-commit
Mesa (gallium-mesa-7.4): intel: Handle ARB_vertex_buffer_object state in intel_clear_tris().
Module: Mesa
Branch: gallium-mesa-7.4
Commit: 51e7600d770083c5e29c884a4c688e911def3e93
URL:
http://cgit.freedesktop.org/mesa/mesa/commit/?id=51e7600d770083c5e29c884a4c688e911def3e93
Author: Michel Dänzer daen...@vmware.com
Date: Sat Apr 18 15:47:14 2009 +0200
intel: Handle ARB_vertex_buffer_object state in intel_clear_tris().
Fixes gearsvbo app by Michael Clark.
(cherry picked from commit 54fb6f0053dc153b76a2e6a242bac376c6723279)
---
src/mesa/drivers/dri/intel/intel_clear.c |5 +
1 files changed, 5 insertions(+), 0 deletions(-)
diff --git a/src/mesa/drivers/dri/intel/intel_clear.c
b/src/mesa/drivers/dri/intel/intel_clear.c
index 044e9d3..7be87ce 100644
--- a/src/mesa/drivers/dri/intel/intel_clear.c
+++ b/src/mesa/drivers/dri/intel/intel_clear.c
@@ -148,6 +148,11 @@ intel_clear_tris(GLcontext *ctx, GLbitfield mask)
}
}
+#if FEATURE_ARB_vertex_buffer_object
+ _mesa_BindBufferARB(GL_ARRAY_BUFFER_ARB, 0);
+ _mesa_BindBufferARB(GL_ELEMENT_ARRAY_BUFFER_ARB, 0);
+#endif
+
intel_meta_set_passthrough_transform(intel);
for (i = 0; i 4; i++) {
___
mesa-commit mailing list
mesa-commit@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/mesa-commit
Mesa (gallium-mesa-7.4): mesa: add switch case for GL_VERTEX_STATE_PROGRAM_NV in _mesa_new_program()
Module: Mesa
Branch: gallium-mesa-7.4
Commit: e7d499f9356247cf0a2dc31f950460c4f6a0db35
URL:
http://cgit.freedesktop.org/mesa/mesa/commit/?id=e7d499f9356247cf0a2dc31f950460c4f6a0db35
Author: Brian Paul bri...@vmware.com
Date: Sat Apr 18 10:21:00 2009 -0600
mesa: add switch case for GL_VERTEX_STATE_PROGRAM_NV in _mesa_new_program()
Fixes bug seen in progs/tests/vptest1.c
(cherry picked from master, commit c5af2ed60fa4fe3f33b53a8e252e24cfa490a156)
---
src/mesa/shader/program.c |1 +
1 files changed, 1 insertions(+), 0 deletions(-)
diff --git a/src/mesa/shader/program.c b/src/mesa/shader/program.c
index 828db38..aa6c6c4 100644
--- a/src/mesa/shader/program.c
+++ b/src/mesa/shader/program.c
@@ -296,6 +296,7 @@ _mesa_new_program(GLcontext *ctx, GLenum target, GLuint id)
struct gl_program *prog;
switch (target) {
case GL_VERTEX_PROGRAM_ARB: /* == GL_VERTEX_PROGRAM_NV */
+ case GL_VERTEX_STATE_PROGRAM_NV:
prog = _mesa_init_vertex_program(ctx, CALLOC_STRUCT(gl_vertex_program),
target, id );
break;
___
mesa-commit mailing list
mesa-commit@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/mesa-commit
Mesa (gallium-mesa-7.4): mesa: bump version to 7.4.1
Module: Mesa Branch: gallium-mesa-7.4 Commit: 87cb55e9c6e129fa6f286dc30e110177e9975297 URL: http://cgit.freedesktop.org/mesa/mesa/commit/?id=87cb55e9c6e129fa6f286dc30e110177e9975297 Author: Brian Paul bri...@vmware.com Date: Sat Apr 18 10:48:57 2009 -0600 mesa: bump version to 7.4.1 --- configs/default |4 ++-- src/mesa/main/version.h |4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/configs/default b/configs/default index 7b79cf2..2970b45 100644 --- a/configs/default +++ b/configs/default @@ -9,8 +9,8 @@ CONFIG_NAME = default # Version info MESA_MAJOR=7 -MESA_MINOR=3 -MESA_TINY=0 +MESA_MINOR=4 +MESA_TINY=1 MESA_VERSION = $(MESA_MAJOR).$(MESA_MINOR).$(MESA_TINY) # external projects. This should be useless now that we use libdrm. diff --git a/src/mesa/main/version.h b/src/mesa/main/version.h index 84dcb26..81fc32b 100644 --- a/src/mesa/main/version.h +++ b/src/mesa/main/version.h @@ -1,6 +1,6 @@ /* * Mesa 3-D graphics library - * Version: 7.4 + * Version: 7.4.1 * * Copyright (C) 1999-2008 Brian Paul All Rights Reserved. * @@ -31,7 +31,7 @@ #define MESA_MAJOR 7 #define MESA_MINOR 4 #define MESA_PATCH 0 -#define MESA_VERSION_STRING 7.4 +#define MESA_VERSION_STRING 7.4.1 /* To make version comparison easy */ #define MESA_VERSION(a,b,c) (((a) 16) + ((b) 8) + (c)) ___ mesa-commit mailing list mesa-commit@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/mesa-commit
Mesa (gallium-mesa-7.4): docs: remove unused sections
Module: Mesa Branch: gallium-mesa-7.4 Commit: c490349825e2c5a11a5f598fb52a6f92597f694e URL: http://cgit.freedesktop.org/mesa/mesa/commit/?id=c490349825e2c5a11a5f598fb52a6f92597f694e Author: Brian Paul bri...@vmware.com Date: Sat Apr 18 11:12:33 2009 -0600 docs: remove unused sections --- docs/relnotes-7.4.1.html |9 - 1 files changed, 0 insertions(+), 9 deletions(-) diff --git a/docs/relnotes-7.4.1.html b/docs/relnotes-7.4.1.html index f959e56..6b225e6 100644 --- a/docs/relnotes-7.4.1.html +++ b/docs/relnotes-7.4.1.html @@ -38,11 +38,6 @@ aa0ad323e59d6d10ff33ac0dde462a60 MesaDemos-7.4.1.tar.gz /pre -h2New features/h2 -ul -/ul - - h2Bug fixes/h2 ul liFixed a two-sided lighting bug in fixed-function-to-GPU code generation @@ -59,10 +54,6 @@ aa0ad323e59d6d10ff33ac0dde462a60 MesaDemos-7.4.1.tar.gz liFixed glPopAttrib() bug when restoring user clip planes /ul -h2Changes/h2 -ul -/ul - h2Driver Status/h2 ___ mesa-commit mailing list mesa-commit@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/mesa-commit
Mesa (gallium-mesa-7.4): docs: create 7.4.2 release notes page
Module: Mesa Branch: gallium-mesa-7.4 Commit: dce84002c25fee088a352410e75bff12ff548b3e URL: http://cgit.freedesktop.org/mesa/mesa/commit/?id=dce84002c25fee088a352410e75bff12ff548b3e Author: Brian Paul bri...@vmware.com Date: Sat Apr 18 11:12:41 2009 -0600 docs: create 7.4.2 release notes page --- docs/relnotes-7.4.2.html | 59 ++ docs/relnotes.html |1 + 2 files changed, 60 insertions(+), 0 deletions(-) diff --git a/docs/relnotes-7.4.2.html b/docs/relnotes-7.4.2.html new file mode 100644 index 000..9b6017f --- /dev/null +++ b/docs/relnotes-7.4.2.html @@ -0,0 +1,59 @@ +HTML + +TITLEMesa Release Notes/TITLE + +headlink rel=stylesheet type=text/css href=mesa.css/head + +BODY + +body bgcolor=#ee + +H1Mesa 7.4.2 Release Notes / TBD/H1 + +p +Mesa 7.4.2 is a stable development release fixing bugs since the 7.4.1 release. +/p +p +Mesa 7.4.2 implements the OpenGL 2.1 API, but the version reported by +glGetString(GL_VERSION) depends on the particular driver being used. +Some drivers don't support all the features required in OpenGL 2.1. +/p +p +See the a href=install.htmlCompiling/Installing page/a for prerequisites +for DRI ardware acceleration. +/p + + +h2MD5 checksums/h2 +pre +tbd +/pre + + +h2Bug fixes/h2 +ul +/ul + + + +h2Driver Status/h2 + +pre +Driver Status +-- -- +DRI driversvaries with the driver +XMesa/GLX (on Xlib)implements OpenGL 2.1 +OSMesa (off-screen)implements OpenGL 2.1 +Windows/Win32 implements OpenGL 2.1 +Glide (3dfx Voodoo1/2) implements OpenGL 1.3 +SVGA unsupported +Wind River UGL unsupported +DJGPP unsupported +GGIunsupported +BeOS unsupported +Allegrounsupported +D3Dunsupported +/pre + +/body +/html diff --git a/docs/relnotes.html b/docs/relnotes.html index 2a4790d..ca808af 100644 --- a/docs/relnotes.html +++ b/docs/relnotes.html @@ -20,6 +20,7 @@ The release notes summarize what's new or changed in each Mesa release. /p UL +LIA HREF=relnotes-7.4.2.html7.4.2 release notes/A LIA HREF=relnotes-7.4.1.html7.4.1 release notes/A LIA HREF=relnotes-7.4.html7.4 release notes/A LIA HREF=relnotes-7.3.html7.3 release notes/A ___ mesa-commit mailing list mesa-commit@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/mesa-commit
Mesa (gallium-mesa-7.4): intel: added null screen-dri2. loader pointer check
Module: Mesa
Branch: gallium-mesa-7.4
Commit: c38397866d514d7776b0f876123be5718802482b
URL:
http://cgit.freedesktop.org/mesa/mesa/commit/?id=c38397866d514d7776b0f876123be5718802482b
Author: Brian Paul bri...@vmware.com
Date: Mon Apr 20 16:12:16 2009 -0600
intel: added null screen-dri2.loader pointer check
Fixes front-buffer rendering with DRI1.
---
src/mesa/drivers/dri/intel/intel_context.c |3 ++-
1 files changed, 2 insertions(+), 1 deletions(-)
diff --git a/src/mesa/drivers/dri/intel/intel_context.c
b/src/mesa/drivers/dri/intel/intel_context.c
index ddcd264..ecaf6b4 100644
--- a/src/mesa/drivers/dri/intel/intel_context.c
+++ b/src/mesa/drivers/dri/intel/intel_context.c
@@ -534,7 +534,8 @@ intel_flush(GLcontext *ctx, GLboolean needs_mi_flush)
if ((ctx-DrawBuffer-Name == 0) intel-front_buffer_dirty) {
__DRIscreen *const screen = intel-intelScreen-driScrnPriv;
- if ((screen-dri2.loader-base.version = 2)
+ if (screen-dri2.loader
+ (screen-dri2.loader-base.version = 2)
(screen-dri2.loader-flushFrontBuffer != NULL)) {
(*screen-dri2.loader-flushFrontBuffer)(intel-driDrawable,
intel-driDrawable-loaderPrivate);
___
mesa-commit mailing list
mesa-commit@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/mesa-commit
Mesa (gallium-mesa-7.4): fixed intel front-buffer rendering segfault
Module: Mesa Branch: gallium-mesa-7.4 Commit: e8807a14a61a0b9389aa2f2a113da24ab22a364d URL: http://cgit.freedesktop.org/mesa/mesa/commit/?id=e8807a14a61a0b9389aa2f2a113da24ab22a364d Author: Brian Paul bri...@vmware.com Date: Mon Apr 20 16:13:04 2009 -0600 fixed intel front-buffer rendering segfault --- docs/relnotes-7.4.2.html |1 + 1 files changed, 1 insertions(+), 0 deletions(-) diff --git a/docs/relnotes-7.4.2.html b/docs/relnotes-7.4.2.html index 9b6017f..97e6e60 100644 --- a/docs/relnotes-7.4.2.html +++ b/docs/relnotes-7.4.2.html @@ -32,6 +32,7 @@ tbd h2Bug fixes/h2 ul +liFixed segfault when rendering to front buffer with DRI 1. /ul ___ mesa-commit mailing list mesa-commit@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/mesa-commit
Mesa (gallium-mesa-7.4): Merge commit 'origin/mesa_7_4_branch' into gallium-mesa-7.4
Module: Mesa Branch: gallium-mesa-7.4 Commit: 69ae2cfd6ee3d95214f5a0ae2540c46efb340427 URL: http://cgit.freedesktop.org/mesa/mesa/commit/?id=69ae2cfd6ee3d95214f5a0ae2540c46efb340427 Author: Alan Hourihane al...@vmware.com Date: Fri Apr 24 17:23:38 2009 +0100 Merge commit 'origin/mesa_7_4_branch' into gallium-mesa-7.4 --- ___ mesa-commit mailing list mesa-commit@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/mesa-commit
Mesa (gallium-mesa-7.4): intel: Fix commented-out glViewport in intel_meta_set_passthrough_transform.
Module: Mesa Branch: gallium-mesa-7.4 Commit: dd56897b27875cacc1a01cef7c2d921915c94312 URL: http://cgit.freedesktop.org/mesa/mesa/commit/?id=dd56897b27875cacc1a01cef7c2d921915c94312 Author: Eric Anholt e...@anholt.net Date: Tue Feb 3 20:04:24 2009 -0800 intel: Fix commented-out glViewport in intel_meta_set_passthrough_transform. Too much commit -a while debugging. (cherry picked from commit 8910da5b7a3b83d733f020dec906fe7b56c093c7) --- src/mesa/drivers/dri/intel/intel_pixel.c |6 +++--- 1 files changed, 3 insertions(+), 3 deletions(-) diff --git a/src/mesa/drivers/dri/intel/intel_pixel.c b/src/mesa/drivers/dri/intel/intel_pixel.c index f440a77..5e32288 100644 --- a/src/mesa/drivers/dri/intel/intel_pixel.c +++ b/src/mesa/drivers/dri/intel/intel_pixel.c @@ -183,7 +183,7 @@ intel_meta_set_passthrough_transform(struct intel_context *intel) intel-meta.saved_vp_height = ctx-Viewport.Height; intel-meta.saved_matrix_mode = ctx-Transform.MatrixMode; - /* _mesa_Viewport(0, 0, ctx-DrawBuffer-Width, ctx-DrawBuffer-Height);*/ + _mesa_Viewport(0, 0, ctx-DrawBuffer-Width, ctx-DrawBuffer-Height); _mesa_MatrixMode(GL_PROJECTION); _mesa_PushMatrix(); @@ -205,8 +205,8 @@ intel_meta_restore_transform(struct intel_context *intel) _mesa_MatrixMode(intel-meta.saved_matrix_mode); - /* _mesa_Viewport(intel-meta.saved_vp_x, intel-meta.saved_vp_y, - intel-meta.saved_vp_width, intel-meta.saved_vp_height);*/ + _mesa_Viewport(intel-meta.saved_vp_x, intel-meta.saved_vp_y, + intel-meta.saved_vp_width, intel-meta.saved_vp_height); } /** ___ mesa-commit mailing list mesa-commit@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/mesa-commit
Mesa (gallium-mesa-7.4): demos: ensure display lists are destroyed for next generation
Module: Mesa Branch: gallium-mesa-7.4 Commit: bfd6bb31a6bc162413cecd23b69389fa930cbf56 URL: http://cgit.freedesktop.org/mesa/mesa/commit/?id=bfd6bb31a6bc162413cecd23b69389fa930cbf56 Author: Alan Hourihane al...@vmware.com Date: Fri Apr 24 16:44:58 2009 +0100 demos: ensure display lists are destroyed for next generation --- progs/xdemos/glxcontexts.c |4 1 files changed, 4 insertions(+), 0 deletions(-) diff --git a/progs/xdemos/glxcontexts.c b/progs/xdemos/glxcontexts.c index a9ff326..a97b62a 100644 --- a/progs/xdemos/glxcontexts.c +++ b/progs/xdemos/glxcontexts.c @@ -385,6 +385,10 @@ draw( Display *dpy, Window win ) } else do_draw(); + glDeleteLists(gear1, 1); + glDeleteLists(gear2, 1); + glDeleteLists(gear3, 1); + glXSwapBuffers(dpy, win); glXDestroyContext(dpy, ctx); } ___ mesa-commit mailing list mesa-commit@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/mesa-commit
Mesa (gallium-mesa-7.4): i965: Support drawing to FBO cube faces other than positive X.
Module: Mesa
Branch: gallium-mesa-7.4
Commit: c3e7fc394f9590ac35755e722995fd88bbfd11ce
URL:
http://cgit.freedesktop.org/mesa/mesa/commit/?id=c3e7fc394f9590ac35755e722995fd88bbfd11ce
Author: Eric Anholt e...@anholt.net
Date: Thu Apr 23 09:37:55 2009 -0700
i965: Support drawing to FBO cube faces other than positive X.
Also fixes drawing to 3D texture depth levels.
(cherry picked from commit 8374379572d1c541a804990bc926108360f67c02)
---
src/mesa/drivers/dri/i965/brw_wm_surface_state.c | 18 +++---
1 files changed, 11 insertions(+), 7 deletions(-)
diff --git a/src/mesa/drivers/dri/i965/brw_wm_surface_state.c
b/src/mesa/drivers/dri/i965/brw_wm_surface_state.c
index 3487b85..20889f8 100644
--- a/src/mesa/drivers/dri/i965/brw_wm_surface_state.c
+++ b/src/mesa/drivers/dri/i965/brw_wm_surface_state.c
@@ -310,6 +310,7 @@ brw_update_region_surface(struct brw_context *brw, struct
intel_region *region,
GLubyte color_mask[4];
GLboolean color_blend;
uint32_t tiling;
+ uint32_t draw_offset;
} key;
memset(key, 0, sizeof(key));
@@ -326,6 +327,7 @@ brw_update_region_surface(struct brw_context *brw, struct
intel_region *region,
key.width = region-pitch; /* XXX: not really! */
key.height = region-height;
key.cpp = region-cpp;
+ key.draw_offset = region-draw_offset; /* cur 3d or cube face offset */
} else {
key.surface_type = BRW_SURFACE_NULL;
key.surface_format = BRW_SURFACEFORMAT_B8G8R8A8_UNORM;
@@ -333,6 +335,7 @@ brw_update_region_surface(struct brw_context *brw, struct
intel_region *region,
key.width = 1;
key.height = 1;
key.cpp = 4;
+ key.draw_offset = 0;
}
memcpy(key.color_mask, ctx-Color.ColorMask,
sizeof(key.color_mask));
@@ -354,8 +357,9 @@ brw_update_region_surface(struct brw_context *brw, struct
intel_region *region,
surf.ss0.surface_format = key.surface_format;
surf.ss0.surface_type = key.surface_type;
+ surf.ss1.base_addr = key.draw_offset;
if (region_bo != NULL)
-surf.ss1.base_addr = region_bo-offset; /* reloc */
+surf.ss1.base_addr += region_bo-offset; /* reloc */
surf.ss2.width = key.width - 1;
surf.ss2.height = key.height - 1;
@@ -380,12 +384,12 @@ brw_update_region_surface(struct brw_context *brw, struct
intel_region *region,
* them both. We might be able to figure out from other state
* a more restrictive relocation to emit.
*/
-dri_bo_emit_reloc(brw-wm.surf_bo[unit],
- I915_GEM_DOMAIN_RENDER,
- I915_GEM_DOMAIN_RENDER,
- 0,
- offsetof(struct brw_surface_state, ss1),
- region_bo);
+drm_intel_bo_emit_reloc(brw-wm.surf_bo[unit],
+offsetof(struct brw_surface_state, ss1),
+region_bo,
+key.draw_offset,
+I915_GEM_DOMAIN_RENDER,
+I915_GEM_DOMAIN_RENDER);
}
}
}
___
mesa-commit mailing list
mesa-commit@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/mesa-commit
Mesa (gallium-mesa-7.4): docs: prep for 7.4.1 release
Module: Mesa Branch: gallium-mesa-7.4 Commit: 5654197d126d2fe7020edfc462ee529363a4182c URL: http://cgit.freedesktop.org/mesa/mesa/commit/?id=5654197d126d2fe7020edfc462ee529363a4182c Author: Brian Paul bri...@vmware.com Date: Sat Apr 18 10:49:08 2009 -0600 docs: prep for 7.4.1 release --- docs/download.html |2 +- docs/news.html |7 +++ docs/relnotes-7.4.1.html |2 +- 3 files changed, 9 insertions(+), 2 deletions(-) diff --git a/docs/download.html b/docs/download.html index 697eef5..877698e 100644 --- a/docs/download.html +++ b/docs/download.html @@ -9,7 +9,7 @@ H1Downloading/H1 p -Current stable release: b7.4/b +Current stable release: b7.4.1/b br Last unstable/development release: b7.3/b /p diff --git a/docs/news.html b/docs/news.html index d34c273..e032a6a 100644 --- a/docs/news.html +++ b/docs/news.html @@ -11,6 +11,13 @@ H1News/H1 +h2April 18, 2009/h2 +p +a href=relnotes-7.4.1.htmlMesa 7.4.1/a is released. +This is a stable release fixing bugs since the 7.4 release. +/p + + h2March 27, 2009/h2 p a href=relnotes-7.4.htmlMesa 7.4/a is released. diff --git a/docs/relnotes-7.4.1.html b/docs/relnotes-7.4.1.html index af6afe0..9439f98 100644 --- a/docs/relnotes-7.4.1.html +++ b/docs/relnotes-7.4.1.html @@ -8,7 +8,7 @@ body bgcolor=#ee -H1Mesa 7.4.1 Release Notes / (date TBD)/H1 +H1Mesa 7.4.1 Release Notes / 18 April 2009/H1 p Mesa 7.4.1 is a stable development release fixing bugs since the 7.4 release. ___ mesa-commit mailing list mesa-commit@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/mesa-commit
Mesa (gallium-mesa-7.4): docs: MD5 sums for 7.4.1 release
Module: Mesa Branch: gallium-mesa-7.4 Commit: f62d45fd0d61563d201e9dd219c447afbd246af9 URL: http://cgit.freedesktop.org/mesa/mesa/commit/?id=f62d45fd0d61563d201e9dd219c447afbd246af9 Author: Brian Paul bri...@vmware.com Date: Sat Apr 18 11:03:25 2009 -0600 docs: MD5 sums for 7.4.1 release --- docs/relnotes-7.4.1.html | 10 +- 1 files changed, 9 insertions(+), 1 deletions(-) diff --git a/docs/relnotes-7.4.1.html b/docs/relnotes-7.4.1.html index 9439f98..f959e56 100644 --- a/docs/relnotes-7.4.1.html +++ b/docs/relnotes-7.4.1.html @@ -26,7 +26,15 @@ for DRI ardware acceleration. h2MD5 checksums/h2 pre -tbd +0c3a72f3295a53a134c04bd7d209ea62 MesaLib-7.4.1.tar.gz +423260578b653818ba66c2fcbde6d7ad MesaLib-7.4.1.tar.bz2 +84f78b154d4bd5c3ecc42eeff2e56676 MesaLib-7.4.1.zip +aa0ad323e59d6d10ff33ac0dde462a60 MesaDemos-7.4.1.tar.gz +1e169fb6abc2b45613f1c98a82dfe690 MesaDemos-7.4.1.tar.bz2 +294e42be2d74176596c994ec23322fcf MesaDemos-7.4.1.zip +92373bfa48e7b68dddf356e86b0e5699 MesaGLUT-7.4.1.tar.gz +336f3824b578b072211e0beecf4f04f4 MesaGLUT-7.4.1.tar.bz2 +20751388d8ef16b42d25d9e3d705d101 MesaGLUT-7.4.1.zip /pre ___ mesa-commit mailing list mesa-commit@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/mesa-commit
Mesa (gallium-mesa-7.4): mesa: bump version to 7.4.1
Module: Mesa Branch: gallium-mesa-7.4 Commit: 7c1e61f41c940448962aa90b8cc837739055384e URL: http://cgit.freedesktop.org/mesa/mesa/commit/?id=7c1e61f41c940448962aa90b8cc837739055384e Author: Brian Paul bri...@vmware.com Date: Sat Apr 18 10:49:35 2009 -0600 mesa: bump version to 7.4.1 --- Makefile |2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/Makefile b/Makefile index 0b46e37..4da55db 100644 --- a/Makefile +++ b/Makefile @@ -178,7 +178,7 @@ ultrix-gcc: # Rules for making release tarballs -VERSION=7.4 +VERSION=7.4.1 DIRECTORY = Mesa-$(VERSION) LIB_NAME = MesaLib-$(VERSION) DEMO_NAME = MesaDemos-$(VERSION) ___ mesa-commit mailing list mesa-commit@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/mesa-commit
Mesa (gallium-mesa-7.4): DRI2: Provide an interface for drivers to flush front-buffer rendering
Module: Mesa
Branch: gallium-mesa-7.4
Commit: 98c2c9ef8c9da654fa3af95145c2f92b296bdb47
URL:
http://cgit.freedesktop.org/mesa/mesa/commit/?id=98c2c9ef8c9da654fa3af95145c2f92b296bdb47
Author: Ian Romanick i...@freedesktop.org
Date: Mon Apr 6 12:44:18 2009 -0700
DRI2: Provide an interface for drivers to flush front-buffer rendering
Signed-off-by: Ian Romanick ian.d.roman...@intel.com
Reviewed-by: Kristian Høgsberg k...@redhat.com
(cherry picked from commit 82634ee8df7328b9235abd8352d33b0b3d953600)
---
include/GL/internal/dri_interface.h | 15 ++-
src/glx/x11/dri2_glx.c | 10 ++
2 files changed, 24 insertions(+), 1 deletions(-)
diff --git a/include/GL/internal/dri_interface.h
b/include/GL/internal/dri_interface.h
index 27cc1be..09ae940 100644
--- a/include/GL/internal/dri_interface.h
+++ b/include/GL/internal/dri_interface.h
@@ -636,7 +636,7 @@ struct __DRIbufferRec {
};
#define __DRI_DRI2_LOADER DRI_DRI2Loader
-#define __DRI_DRI2_LOADER_VERSION 1
+#define __DRI_DRI2_LOADER_VERSION 2
struct __DRIdri2LoaderExtensionRec {
__DRIextension base;
@@ -644,6 +644,19 @@ struct __DRIdri2LoaderExtensionRec {
int *width, int *height,
unsigned int *attachments, int count,
int *out_count, void *loaderPrivate);
+
+/**
+ * Flush pending front-buffer rendering
+ *
+ * Any rendering that has been performed to the
+ * \c __DRI_BUFFER_FAKE_FRONT_LEFT will be flushed to the
+ * \c __DRI_BUFFER_FRONT_LEFT.
+ *
+ * \param driDrawableDrawable whose front-buffer is to be flushed
+ * \param loaderPrivate Loader's private data that was previously passed
+ * into __DRIdri2ExtensionRec::createNewDrawable
+ */
+void (*flushFrontBuffer)(__DRIdrawable *driDrawable, void *loaderPrivate);
};
/**
diff --git a/src/glx/x11/dri2_glx.c b/src/glx/x11/dri2_glx.c
index 6a031d4..5acb3dd 100644
--- a/src/glx/x11/dri2_glx.c
+++ b/src/glx/x11/dri2_glx.c
@@ -257,6 +257,15 @@ static void dri2WaitGL(__GLXDRIdrawable *pdraw)
XFixesDestroyRegion(pdraw-psc-dpy, region);
}
+
+static void dri2FlushFrontBuffer(__DRIdrawable *driDrawable,
+void *loaderPrivate)
+{
+(void) driDrawable;
+dri2WaitGL((__GLXDRIdrawable *) loaderPrivate);
+}
+
+
static void dri2DestroyScreen(__GLXscreenConfigs *psc)
{
/* Free the direct rendering per screen data */
@@ -311,6 +320,7 @@ dri2GetBuffers(__DRIdrawable *driDrawable,
static const __DRIdri2LoaderExtension dri2LoaderExtension = {
{ __DRI_DRI2_LOADER, __DRI_DRI2_LOADER_VERSION },
dri2GetBuffers,
+dri2FlushFrontBuffer
};
static const __DRIextension *loader_extensions[] = {
___
mesa-commit mailing list
mesa-commit@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/mesa-commit
Mesa (gallium-mesa-7.4): intel / DRI2: Track and flush front-buffer rendering
Module: Mesa
Branch: gallium-mesa-7.4
Commit: 4f17040cb10ab9b0c3f36f7ca82f4efd2f9088bc
URL:
http://cgit.freedesktop.org/mesa/mesa/commit/?id=4f17040cb10ab9b0c3f36f7ca82f4efd2f9088bc
Author: Ian Romanick i...@freedesktop.org
Date: Mon Apr 6 13:15:54 2009 -0700
intel / DRI2: Track and flush front-buffer rendering
Track two flags: whether or not front-buffer rendering is currently
enabled and whether or not front-buffer rendering has been enabled
since the last glFlush. If the second flag is set, the front-buffer
is flushed via a loader call back. If the first flag is cleared, the
second flag is cleared at this time.
Signed-off-by: Ian Romanick ian.d.roman...@intel.com
Reviewed-by: Kristian Høgsberg k...@redhat.com
(cherry picked from commit 43cf0d1eebb9f425e1a0e176394b64e2cb406709)
---
src/mesa/drivers/dri/intel/intel_buffers.c |8
src/mesa/drivers/dri/intel/intel_context.c | 20
src/mesa/drivers/dri/intel/intel_context.h | 18 ++
3 files changed, 46 insertions(+), 0 deletions(-)
diff --git a/src/mesa/drivers/dri/intel/intel_buffers.c
b/src/mesa/drivers/dri/intel/intel_buffers.c
index f1908cb..7bf1512 100644
--- a/src/mesa/drivers/dri/intel/intel_buffers.c
+++ b/src/mesa/drivers/dri/intel/intel_buffers.c
@@ -204,6 +204,8 @@ intel_draw_buffer(GLcontext * ctx, struct gl_framebuffer
*fb)
intel_batchbuffer_flush(intel-batch);
intel-front_cliprects = GL_TRUE;
colorRegions[0] = intel_get_rb_region(fb, BUFFER_FRONT_LEFT);
+
+ intel-front_buffer_dirty = GL_TRUE;
}
else {
if (!intel-constant_cliprect intel-front_cliprects)
@@ -328,6 +330,12 @@ intel_draw_buffer(GLcontext * ctx, struct gl_framebuffer
*fb)
static void
intelDrawBuffer(GLcontext * ctx, GLenum mode)
{
+ if (ctx-DrawBuffer-Name == 0) {
+ struct intel_context *const intel = intel_context(ctx);
+
+ intel-is_front_buffer_rendering = (mode == GL_FRONT_LEFT);
+ }
+
intel_draw_buffer(ctx, ctx-DrawBuffer);
}
diff --git a/src/mesa/drivers/dri/intel/intel_context.c
b/src/mesa/drivers/dri/intel/intel_context.c
index 2e76e93..5f72761 100644
--- a/src/mesa/drivers/dri/intel/intel_context.c
+++ b/src/mesa/drivers/dri/intel/intel_context.c
@@ -525,6 +525,26 @@ intel_flush(GLcontext *ctx, GLboolean needs_mi_flush)
if (intel-batch-map != intel-batch-ptr)
intel_batchbuffer_flush(intel-batch);
+
+ if ((ctx-DrawBuffer-Name == 0) intel-front_buffer_dirty) {
+ __DRIscreen *const screen = intel-intelScreen-driScrnPriv;
+
+ if ((screen-dri2.loader-base.version = 2)
+ (screen-dri2.loader-flushFrontBuffer != NULL)) {
+(*screen-dri2.loader-flushFrontBuffer)(intel-driDrawable,
+
intel-driDrawable-loaderPrivate);
+
+/* Only clear the dirty bit if front-buffer rendering is no longer
+ * enabled. This is done so that the dirty bit can only be set in
+ * glDrawBuffer. Otherwise the dirty bit would have to be set at
+ * each of N places that do rendering. This has worse performances,
+ * but it is much easier to get correct.
+ */
+if (intel-is_front_buffer_rendering) {
+ intel-front_buffer_dirty = GL_FALSE;
+}
+ }
+ }
}
void
diff --git a/src/mesa/drivers/dri/intel/intel_context.h
b/src/mesa/drivers/dri/intel/intel_context.h
index 8a8e59f..8f87d56 100644
--- a/src/mesa/drivers/dri/intel/intel_context.h
+++ b/src/mesa/drivers/dri/intel/intel_context.h
@@ -260,11 +260,29 @@ struct intel_context
* flush time while the lock is held.
*/
GLboolean constant_cliprect;
+
/**
* In !constant_cliprect mode, set to true if the front cliprects should be
* used instead of back.
*/
GLboolean front_cliprects;
+
+ /**
+* Set if rendering has occured to the drawable's front buffer.
+*
+* This is used in the DRI2 case to detect that glFlush should also copy
+* the contents of the fake front buffer to the real front buffer.
+*/
+ GLboolean front_buffer_dirty;
+
+ /**
+* Track whether front-buffer rendering is currently enabled
+*
+* A separate flag is used to track this in order to support MRT more
+* easily.
+*/
+ GLboolean is_front_buffer_rendering;
+
drm_clip_rect_t fboRect; /** cliprect for FBO rendering */
int perf_boxes;
___
mesa-commit mailing list
mesa-commit@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/mesa-commit
Mesa (gallium-mesa-7.4): intel / DRI2: Accept fake front-buffer from loader
Module: Mesa Branch: gallium-mesa-7.4 Commit: 46059378433970a5557bd667e93b3d61b14caa5a URL: http://cgit.freedesktop.org/mesa/mesa/commit/?id=46059378433970a5557bd667e93b3d61b14caa5a Author: Ian Romanick i...@freedesktop.org Date: Tue Apr 7 11:23:10 2009 -0700 intel / DRI2: Accept fake front-buffer from loader Handle the loader returning a fake front-buffer. Since the driver never specifically requests a fake front-buffer, the driver assumes that it will never receive both a fake and a real front-buffer. Signed-off-by: Ian Romanick ian.d.roman...@intel.com Reviewed-by: Kristian Høgsberg k...@redhat.com (cherry picked from commit 6a6e478e714226c6f15c63c393f5c0d74de4) --- src/mesa/drivers/dri/intel/intel_context.c |5 + 1 files changed, 5 insertions(+), 0 deletions(-) diff --git a/src/mesa/drivers/dri/intel/intel_context.c b/src/mesa/drivers/dri/intel/intel_context.c index 5f72761..f391da9 100644 --- a/src/mesa/drivers/dri/intel/intel_context.c +++ b/src/mesa/drivers/dri/intel/intel_context.c @@ -265,6 +265,11 @@ intel_update_renderbuffers(__DRIcontext *context, __DRIdrawable *drawable) region_name = dri2 front buffer; break; + case __DRI_BUFFER_FAKE_FRONT_LEFT: + rb = intel_fb-color_rb[0]; + region_name = dri2 fake front buffer; + break; + case __DRI_BUFFER_BACK_LEFT: rb = intel_fb-color_rb[1]; region_name = dri2 back buffer; ___ mesa-commit mailing list mesa-commit@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/mesa-commit
Mesa (gallium-mesa-7.4): DRI2: Assume that there is always a front buffer
Module: Mesa
Branch: gallium-mesa-7.4
Commit: b8ef30c45c158077d11b9f5839aacb6ff4b67da8
URL:
http://cgit.freedesktop.org/mesa/mesa/commit/?id=b8ef30c45c158077d11b9f5839aacb6ff4b67da8
Author: Ian Romanick i...@freedesktop.org
Date: Mon Apr 6 15:35:37 2009 -0700
DRI2: Assume that there is always a front buffer
Assume that the front-buffer exists even if the server didn't tell the
client that it exists.
Signed-off-by: Ian Romanick ian.d.roman...@intel.com
Reviewed-by: Kristian Høgsberg k...@redhat.com
(cherry picked from commit e6386e0d9a461e7bc96ae7137de9c0a33f24c1a4)
---
src/glx/x11/dri2_glx.c | 10 +++---
1 files changed, 3 insertions(+), 7 deletions(-)
diff --git a/src/glx/x11/dri2_glx.c b/src/glx/x11/dri2_glx.c
index 5acb3dd..c97f981 100644
--- a/src/glx/x11/dri2_glx.c
+++ b/src/glx/x11/dri2_glx.c
@@ -74,7 +74,6 @@ struct __GLXDRIdrawablePrivateRec {
int bufferCount;
int width, height;
int have_back;
-int have_front;
int have_fake_front;
};
@@ -195,7 +194,7 @@ static void dri2CopySubBuffer(__GLXDRIdrawable *pdraw,
XserverRegion region;
/* Check we have the right attachments */
-if (!(priv-have_front priv-have_back))
+if (!priv-have_back)
return;
xrect.x = x;
@@ -223,7 +222,7 @@ static void dri2WaitX(__GLXDRIdrawable *pdraw)
XserverRegion region;
/* Check we have the right attachments */
-if (!(priv-have_fake_front priv-have_front))
+if (!priv-have_fake_front)
return;
xrect.x = 0;
@@ -243,7 +242,7 @@ static void dri2WaitGL(__GLXDRIdrawable *pdraw)
XRectangle xrect;
XserverRegion region;
-if (!(priv-have_fake_front priv-have_front))
+if (!priv-have_fake_front)
return;
xrect.x = 0;
@@ -292,7 +291,6 @@ dri2GetBuffers(__DRIdrawable *driDrawable,
pdraw-width = *width;
pdraw-height = *height;
pdraw-bufferCount = *out_count;
-pdraw-have_front = 0;
pdraw-have_fake_front = 0;
pdraw-have_back = 0;
@@ -304,8 +302,6 @@ dri2GetBuffers(__DRIdrawable *driDrawable,
pdraw-buffers[i].pitch = buffers[i].pitch;
pdraw-buffers[i].cpp = buffers[i].cpp;
pdraw-buffers[i].flags = buffers[i].flags;
- if (pdraw-buffers[i].attachment == __DRI_BUFFER_FRONT_LEFT)
- pdraw-have_front = 1;
if (pdraw-buffers[i].attachment == __DRI_BUFFER_FAKE_FRONT_LEFT)
pdraw-have_fake_front = 1;
if (pdraw-buffers[i].attachment == __DRI_BUFFER_BACK_LEFT)
___
mesa-commit mailing list
mesa-commit@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/mesa-commit
Mesa (gallium-mesa-7.4): intel: Bump driver date
Module: Mesa Branch: gallium-mesa-7.4 Commit: 85396d8ef4f7fc4702578a3d4e89844c7e238acc URL: http://cgit.freedesktop.org/mesa/mesa/commit/?id=85396d8ef4f7fc4702578a3d4e89844c7e238acc Author: Ian Romanick ian.d.roman...@intel.com Date: Wed Apr 15 15:12:48 2009 -0700 intel: Bump driver date --- src/mesa/drivers/dri/intel/intel_context.c |2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/src/mesa/drivers/dri/intel/intel_context.c b/src/mesa/drivers/dri/intel/intel_context.c index f391da9..e91abd7 100644 --- a/src/mesa/drivers/dri/intel/intel_context.c +++ b/src/mesa/drivers/dri/intel/intel_context.c @@ -97,7 +97,7 @@ int INTEL_DEBUG = (0); #include extension_helper.h -#define DRIVER_DATE 20090326 2009Q1 RC2 +#define DRIVER_DATE 20090415 2009Q1 RC3 #define DRIVER_DATE_GEM GEM DRIVER_DATE static const GLubyte * ___ mesa-commit mailing list mesa-commit@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/mesa-commit
Mesa (gallium-mesa-7.4): demos: use larger buffer for snprintf() call, see bug 21220
Module: Mesa
Branch: gallium-mesa-7.4
Commit: 1f462e26c0c9ab93d2300bb1d4463e63e393332a
URL:
http://cgit.freedesktop.org/mesa/mesa/commit/?id=1f462e26c0c9ab93d2300bb1d4463e63e393332a
Author: Brian Paul bri...@vmware.com
Date: Thu Apr 16 09:26:54 2009 -0600
demos: use larger buffer for snprintf() call, see bug 21220
(cherry picked from master, commit 0d0028e6df3542272ce833fec2e7af99d762fe8f)
---
progs/samples/blendeq.c |2 +-
1 files changed, 1 insertions(+), 1 deletions(-)
diff --git a/progs/samples/blendeq.c b/progs/samples/blendeq.c
index d5143ec..48dea04 100644
--- a/progs/samples/blendeq.c
+++ b/progs/samples/blendeq.c
@@ -103,7 +103,7 @@ static void PrintColorStrings( void )
{
GLubyte ubbuf[3];
int i, xleft, xright;
-char colorString[18];
+char colorString[100];
xleft = 5 + windW/4;
xright = 5 + windW/2;
___
mesa-commit mailing list
mesa-commit@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/mesa-commit
Mesa (gallium-mesa-7.4): docs: fixed user clip plane restore bug in glPopAttrib()
Module: Mesa Branch: gallium-mesa-7.4 Commit: a975da7aca34883bc2a723306fbf95a3365a65d8 URL: http://cgit.freedesktop.org/mesa/mesa/commit/?id=a975da7aca34883bc2a723306fbf95a3365a65d8 Author: Brian Paul bri...@vmware.com Date: Thu Apr 16 10:16:38 2009 -0600 docs: fixed user clip plane restore bug in glPopAttrib() --- docs/relnotes-7.4.1.html |1 + 1 files changed, 1 insertions(+), 0 deletions(-) diff --git a/docs/relnotes-7.4.1.html b/docs/relnotes-7.4.1.html index e7cec4b..af6afe0 100644 --- a/docs/relnotes-7.4.1.html +++ b/docs/relnotes-7.4.1.html @@ -48,6 +48,7 @@ tbd liFixed potential deadlock in object hash functions liFix a couple bugs surrounding front-buffer rendering with DRI2, but this is not quite complete. +liFixed glPopAttrib() bug when restoring user clip planes /ul h2Changes/h2 ___ mesa-commit mailing list mesa-commit@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/mesa-commit
Mesa (gallium-mesa-7.4): Merge commit 'origin/mesa_7_4_branch' into gallium-mesa-7.4
Module: Mesa Branch: gallium-mesa-7.4 Commit: f0b717f16a0b5a0d77cc1ac4db914c8ffcf27b81 URL: http://cgit.freedesktop.org/mesa/mesa/commit/?id=f0b717f16a0b5a0d77cc1ac4db914c8ffcf27b81 Author: Alan Hourihane al...@vmware.com Date: Fri Apr 17 01:34:32 2009 +0100 Merge commit 'origin/mesa_7_4_branch' into gallium-mesa-7.4 Conflicts: Makefile --- ___ mesa-commit mailing list mesa-commit@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/mesa-commit
Mesa (gallium-mesa-7.4): mesa: fix bad mask bit in clip plane restore code for glPopAttrib()
Module: Mesa
Branch: gallium-mesa-7.4
Commit: ecf47b504656b47410664cbe3e5b7bfad5cc0db4
URL:
http://cgit.freedesktop.org/mesa/mesa/commit/?id=ecf47b504656b47410664cbe3e5b7bfad5cc0db4
Author: Brian Paul bri...@vmware.com
Date: Thu Apr 16 10:16:26 2009 -0600
mesa: fix bad mask bit in clip plane restore code for glPopAttrib()
(cherry picked from master commit d82876e850960eb5e3799c4ab02b618c4b548fd8)
---
src/mesa/main/attrib.c |2 +-
1 files changed, 1 insertions(+), 1 deletions(-)
diff --git a/src/mesa/main/attrib.c b/src/mesa/main/attrib.c
index ef1273d..a549512 100644
--- a/src/mesa/main/attrib.c
+++ b/src/mesa/main/attrib.c
@@ -1176,7 +1176,7 @@ _mesa_PopAttrib(void)
/* restore clip planes */
for (i = 0; i MAX_CLIP_PLANES; i++) {
- const GLuint mask = 1 1;
+ const GLuint mask = 1 i;
const GLfloat *eyePlane = xform-EyeUserPlane[i];
COPY_4V(ctx-Transform.EyeUserPlane[i], eyePlane);
if (xform-ClipPlanesEnabled mask) {
___
mesa-commit mailing list
mesa-commit@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/mesa-commit
Mesa (gallium-mesa-7.4): mesa: add distclean target to top-level Makefile
Module: Mesa
Branch: gallium-mesa-7.4
Commit: fed8dc53ad46e71bed8d53e4ccdbe4547ad11814
URL:
http://cgit.freedesktop.org/mesa/mesa/commit/?id=fed8dc53ad46e71bed8d53e4ccdbe4547ad11814
Author: Brian Paul bri...@vmware.com
Date: Thu Apr 16 09:34:06 2009 -0600
mesa: add distclean target to top-level Makefile
(cherry picked from master, commit 666702baec09f60f7e1eddd9f1dd65ee2e826abb)
---
Makefile |6 +-
1 files changed, 5 insertions(+), 1 deletions(-)
diff --git a/Makefile b/Makefile
index 726b263..0b46e37 100644
--- a/Makefile
+++ b/Makefile
@@ -35,6 +35,8 @@ realclean: clean
-name depend -o -name depend.bak ')' -exec rm -f '{}' ';'
+distclean: realclean
+
install:
@for dir in $(SUBDIRS) ; do \
@@ -48,7 +50,9 @@ install:
linux-directfb-install:
cd src/mesa/drivers/directfb $(MAKE) install
-.PHONY: default doxygen clean realclean install linux-directfb-install
+
+.PHONY: default doxygen clean realclean distclean install
linux-directfb-install
+
# If there's no current configuration file
$(TOP)/configs/current:
___
mesa-commit mailing list
mesa-commit@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/mesa-commit
Mesa (gallium-mesa-7.4): Merge commit 'origin/mesa_7_4_branch' into gallium-mesa-7.4
Module: Mesa Branch: gallium-mesa-7.4 Commit: f78c855e784e06ce5e08fa7ddd0e11b284b5273f URL: http://cgit.freedesktop.org/mesa/mesa/commit/?id=f78c855e784e06ce5e08fa7ddd0e11b284b5273f Author: Alan Hourihane al...@vmware.com Date: Thu Apr 9 18:04:30 2009 +0100 Merge commit 'origin/mesa_7_4_branch' into gallium-mesa-7.4 --- ___ mesa-commit mailing list mesa-commit@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/mesa-commit
Mesa (gallium-mesa-7.4): tgsi/sse2: Fix ARL instruction.
Module: Mesa
Branch: gallium-mesa-7.4
Commit: 594e5b81f409eead1b8078f90d0cddb58b9e583e
URL:
http://cgit.freedesktop.org/mesa/mesa/commit/?id=594e5b81f409eead1b8078f90d0cddb58b9e583e
Author: Michal Krol mic...@vmware.com
Date: Thu Apr 9 22:47:06 2009 +0200
tgsi/sse2: Fix ARL instruction.
---
src/gallium/auxiliary/tgsi/tgsi_sse2.c |1 +
1 files changed, 1 insertions(+), 0 deletions(-)
diff --git a/src/gallium/auxiliary/tgsi/tgsi_sse2.c
b/src/gallium/auxiliary/tgsi/tgsi_sse2.c
index 9424cb4..e1f2150 100644
--- a/src/gallium/auxiliary/tgsi/tgsi_sse2.c
+++ b/src/gallium/auxiliary/tgsi/tgsi_sse2.c
@@ -1477,6 +1477,7 @@ emit_instruction(
case TGSI_OPCODE_ARL:
FOR_EACH_DST0_ENABLED_CHANNEL( *inst, chan_index ) {
FETCH( func, *inst, 0, 0, chan_index );
+ emit_flr(func, 0);
emit_f2it( func, 0 );
STORE( func, *inst, 0, 0, chan_index );
}
___
mesa-commit mailing list
mesa-commit@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/mesa-commit
Mesa (gallium-mesa-7.4): tgsi/sse2: Fix LIT instruction.
Module: Mesa Branch: gallium-mesa-7.4 Commit: fe7a7d3e0cdee2b0f9f3ac802e113575be2f9565 URL: http://cgit.freedesktop.org/mesa/mesa/commit/?id=fe7a7d3e0cdee2b0f9f3ac802e113575be2f9565 Author: Michal Krol mic...@vmware.com Date: Thu Apr 9 22:38:07 2009 +0200 tgsi/sse2: Fix LIT instruction. --- src/gallium/auxiliary/tgsi/tgsi_sse2.c |2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/src/gallium/auxiliary/tgsi/tgsi_sse2.c b/src/gallium/auxiliary/tgsi/tgsi_sse2.c index e1f2150..c2405a1 100644 --- a/src/gallium/auxiliary/tgsi/tgsi_sse2.c +++ b/src/gallium/auxiliary/tgsi/tgsi_sse2.c @@ -1554,7 +1554,7 @@ emit_instruction( func, make_xmm( 2 ), make_xmm( 0 ), - cc_LessThanEqual ); + cc_LessThan ); sse_andps( func, make_xmm( 2 ), ___ mesa-commit mailing list mesa-commit@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/mesa-commit
Mesa (gallium-mesa-7.4): draw: Fix LIT instruction.
Module: Mesa
Branch: gallium-mesa-7.4
Commit: 1a06f2163f56130afe340d84f636cbd9c26e3180
URL:
http://cgit.freedesktop.org/mesa/mesa/commit/?id=1a06f2163f56130afe340d84f636cbd9c26e3180
Author: Michal Krol mic...@vmware.com
Date: Thu Apr 9 23:17:02 2009 +0200
draw: Fix LIT instruction.
---
src/gallium/auxiliary/draw/draw_vs_aos_machine.c |4 ++--
1 files changed, 2 insertions(+), 2 deletions(-)
diff --git a/src/gallium/auxiliary/draw/draw_vs_aos_machine.c
b/src/gallium/auxiliary/draw/draw_vs_aos_machine.c
index b358bd2..3240e37 100644
--- a/src/gallium/auxiliary/draw/draw_vs_aos_machine.c
+++ b/src/gallium/auxiliary/draw/draw_vs_aos_machine.c
@@ -74,7 +74,7 @@ void PIPE_CDECL aos_do_lit( struct aos_machine *machine,
{
result[0] = 1.0F;
result[1] = in[0];
- result[2] = 1.0;
+ result[2] = 0.0F;
result[3] = 1.0F;
}
else
@@ -108,7 +108,7 @@ static void PIPE_CDECL do_lit_lut( struct aos_machine
*machine,
{
result[0] = 1.0F;
result[1] = in[0];
- result[2] = 1.0;
+ result[2] = 0.0F;
result[3] = 1.0F;
return;
}
___
mesa-commit mailing list
mesa-commit@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/mesa-commit
Mesa (gallium-mesa-7.4): tgsi/sse2: Fix build.
Module: Mesa
Branch: gallium-mesa-7.4
Commit: 9047a55c0d6e7a2212a1a4defc92bad26d1d06ed
URL:
http://cgit.freedesktop.org/mesa/mesa/commit/?id=9047a55c0d6e7a2212a1a4defc92bad26d1d06ed
Author: Michal Krol mic...@vmware.com
Date: Thu Apr 9 23:24:57 2009 +0200
tgsi/sse2: Fix build.
---
src/gallium/auxiliary/tgsi/tgsi_sse2.c |2 +-
1 files changed, 1 insertions(+), 1 deletions(-)
diff --git a/src/gallium/auxiliary/tgsi/tgsi_sse2.c
b/src/gallium/auxiliary/tgsi/tgsi_sse2.c
index c2405a1..6fa615b 100644
--- a/src/gallium/auxiliary/tgsi/tgsi_sse2.c
+++ b/src/gallium/auxiliary/tgsi/tgsi_sse2.c
@@ -1477,7 +1477,7 @@ emit_instruction(
case TGSI_OPCODE_ARL:
FOR_EACH_DST0_ENABLED_CHANNEL( *inst, chan_index ) {
FETCH( func, *inst, 0, 0, chan_index );
- emit_flr(func, 0);
+ emit_flr(func, 0, 0);
emit_f2it( func, 0 );
STORE( func, *inst, 0, 0, chan_index );
}
___
mesa-commit mailing list
mesa-commit@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/mesa-commit
Mesa (master): gallium: when using gl_PointCoord ensure we use the correct attribute.
Module: Mesa
Branch: master
Commit: a97c846d613c3d7ec962ee095fd8282fa3b84eea
URL:
http://cgit.freedesktop.org/mesa/mesa/commit/?id=a97c846d613c3d7ec962ee095fd8282fa3b84eea
Author: Alan Hourihane al...@vmware.com
Date: Wed Apr 8 16:39:17 2009 +0100
gallium: when using gl_PointCoord ensure we use the correct attribute.
---
src/mesa/state_tracker/st_program.c |8 +---
1 files changed, 5 insertions(+), 3 deletions(-)
diff --git a/src/mesa/state_tracker/st_program.c
b/src/mesa/state_tracker/st_program.c
index f825204..6348e83 100644
--- a/src/mesa/state_tracker/st_program.c
+++ b/src/mesa/state_tracker/st_program.c
@@ -427,11 +427,13 @@ st_translate_fragment_program(struct st_context *st,
interpMode[slot] = TGSI_INTERPOLATE_LINEAR;
break;
case FRAG_ATTRIB_FOGC:
-if (stfp-Base.UsesPointCoord)
+if (stfp-Base.UsesPointCoord) {
stfp-input_semantic_name[slot] = TGSI_SEMANTIC_GENERIC;
-else
+ stfp-input_semantic_index[slot] = num_generic++;
+} else {
stfp-input_semantic_name[slot] = TGSI_SEMANTIC_FOG;
-stfp-input_semantic_index[slot] = 0;
+ stfp-input_semantic_index[slot] = 0;
+ }
interpMode[slot] = TGSI_INTERPOLATE_PERSPECTIVE;
break;
case FRAG_ATTRIB_TEX0:
___
mesa-commit mailing list
mesa-commit@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/mesa-commit
Mesa (gallium-mesa-7.4): Merge commit 'origin/mesa_7_4_branch' into gallium-mesa-7.4
Module: Mesa Branch: gallium-mesa-7.4 Commit: 49d5b390b340fd9178d13fa21ecb3e05034a0c4a URL: http://cgit.freedesktop.org/mesa/mesa/commit/?id=49d5b390b340fd9178d13fa21ecb3e05034a0c4a Author: Alan Hourihane al...@vmware.com Date: Wed Apr 8 16:41:59 2009 +0100 Merge commit 'origin/mesa_7_4_branch' into gallium-mesa-7.4 --- ___ mesa-commit mailing list mesa-commit@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/mesa-commit
Mesa (gallium-mesa-7.4): swrast: fix point rendering function selection
Module: Mesa
Branch: gallium-mesa-7.4
Commit: 6c3bec4387d7483d4b9652c7eb9313e3ec415898
URL:
http://cgit.freedesktop.org/mesa/mesa/commit/?id=6c3bec4387d7483d4b9652c7eb9313e3ec415898
Author: Brian Paul bri...@vmware.com
Date: Tue Apr 7 13:44:50 2009 -0600
swrast: fix point rendering function selection
Need to clamp default point size to min/max range before checking if it's one.
Fixes glean pointAtten test.
(cherry picked from master, commit 228f20e324249ef25beed725a6a821e0bd0cc232)
---
src/mesa/swrast/s_points.c |5 -
1 files changed, 4 insertions(+), 1 deletions(-)
diff --git a/src/mesa/swrast/s_points.c b/src/mesa/swrast/s_points.c
index 61ff4d0..0a3ad97 100644
--- a/src/mesa/swrast/s_points.c
+++ b/src/mesa/swrast/s_points.c
@@ -570,6 +570,9 @@ void
_swrast_choose_point(GLcontext *ctx)
{
SWcontext *swrast = SWRAST_CONTEXT(ctx);
+ const GLfloat size = CLAMP(ctx-Point.Size,
+ ctx-Point.MinSize,
+ ctx-Point.MaxSize);
if (ctx-RenderMode == GL_RENDER) {
if (ctx-Point.PointSprite) {
@@ -578,7 +581,7 @@ _swrast_choose_point(GLcontext *ctx)
else if (ctx-Point.SmoothFlag) {
swrast-Point = smooth_point;
}
- else if (ctx-Point.Size 1.0 ||
+ else if (size 1.0 ||
ctx-Point._Attenuated ||
ctx-VertexProgram.PointSizeEnabled) {
swrast-Point = large_point;
___
mesa-commit mailing list
mesa-commit@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/mesa-commit
Mesa (gallium-mesa-7.4): mesa: don' t normalize spot light direction until validation time
Module: Mesa
Branch: gallium-mesa-7.4
Commit: 39345a492837d733f158ad594555858a7b40e902
URL:
http://cgit.freedesktop.org/mesa/mesa/commit/?id=39345a492837d733f158ad594555858a7b40e902
Author: Brian Paul bri...@vmware.com
Date: Fri Apr 3 10:16:31 2009 -0600
mesa: don't normalize spot light direction until validation time
In glLight() we're only supposed to transform the direction by the modelview
matrix, not normalized it too.
(cherry picked from commit 650d147289014e8a98f65fbbcd1855b2a4f19d2f)
---
src/mesa/main/light.c |9 +++--
1 files changed, 7 insertions(+), 2 deletions(-)
diff --git a/src/mesa/main/light.c b/src/mesa/main/light.c
index ce50224..4372f7b 100644
--- a/src/mesa/main/light.c
+++ b/src/mesa/main/light.c
@@ -209,7 +209,6 @@ _mesa_Lightfv( GLenum light, GLenum pname, const GLfloat
*params )
_math_matrix_analyse(ctx-ModelviewMatrixStack.Top);
}
TRANSFORM_DIRECTION(temp, params, ctx-ModelviewMatrixStack.Top-m);
- NORMALIZE_3FV(temp);
params = temp;
break;
case GL_SPOT_EXPONENT:
@@ -1137,12 +1136,18 @@ compute_light_positions( GLcontext *ctx )
}
if (light-_Flags LIGHT_SPOT) {
+ /* Note: we normalize the spot direction now */
+
if (ctx-_NeedEyeCoords) {
COPY_3V( light-_NormDirection, light-EyeDirection );
+NORMALIZE_3FV( light-_NormDirection );
}
else {
+GLfloat spotDir[3];
+COPY_3V(spotDir, light-EyeDirection);
+NORMALIZE_3FV(spotDir);
TRANSFORM_NORMAL( light-_NormDirection,
- light-EyeDirection,
+ spotDir,
ctx-ModelviewMatrixStack.Top-m);
}
___
mesa-commit mailing list
mesa-commit@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/mesa-commit
Mesa (gallium-mesa-7.4): radeon: Expose a 32 bit RGBA fbconfig even when the screen depth is 16.
Module: Mesa
Branch: gallium-mesa-7.4
Commit: 775ca8e3fa5ddf090115907c78889ed8311cd3ae
URL:
http://cgit.freedesktop.org/mesa/mesa/commit/?id=775ca8e3fa5ddf090115907c78889ed8311cd3ae
Author: Michel Dänzer daen...@vmware.com
Date: Mon Apr 6 08:59:57 2009 +0200
radeon: Expose a 32 bit RGBA fbconfig even when the screen depth is 16.
Otherwise current xserver / libGL no longer expose a 32 bit RGBA GLX visual,
and compiz fails.
Fixes http://bugs.freedesktop.org/show_bug.cgi?id=20479 .
(Cherry picked from commit e798bf8053612516420a4ec42e2ff58433abd521)
---
src/mesa/drivers/dri/radeon/radeon_screen.c | 31 ++
1 files changed, 17 insertions(+), 14 deletions(-)
diff --git a/src/mesa/drivers/dri/radeon/radeon_screen.c
b/src/mesa/drivers/dri/radeon/radeon_screen.c
index 81337da..ff65e6b 100644
--- a/src/mesa/drivers/dri/radeon/radeon_screen.c
+++ b/src/mesa/drivers/dri/radeon/radeon_screen.c
@@ -259,8 +259,6 @@ radeonFillInModes( __DRIscreenPrivate *psp,
__GLcontextModes *m;
unsigned depth_buffer_factor;
unsigned back_buffer_factor;
-GLenum fb_format;
-GLenum fb_type;
int i;
/* Right now GLX_SWAP_COPY_OML isn't supported, but it would be easy
@@ -289,19 +287,24 @@ radeonFillInModes( __DRIscreenPrivate *psp,
depth_buffer_factor = ((depth_bits != 0) || (stencil_bits != 0)) ? 2 : 1;
back_buffer_factor = (have_back_buffer) ? 2 : 1;
-if ( pixel_bits == 16 ) {
-fb_format = GL_RGB;
-fb_type = GL_UNSIGNED_SHORT_5_6_5;
-}
-else {
-fb_format = GL_BGRA;
-fb_type = GL_UNSIGNED_INT_8_8_8_8_REV;
-}
+if (pixel_bits == 16) {
+ __DRIconfig **configs_a8r8g8b8;
+ __DRIconfig **configs_r5g6b5;
+
+ configs_r5g6b5 = driCreateConfigs(GL_RGB, GL_UNSIGNED_SHORT_5_6_5,
+ depth_bits_array, stencil_bits_array,
+ depth_buffer_factor,
back_buffer_modes,
+ back_buffer_factor);
+ configs_a8r8g8b8 = driCreateConfigs(GL_BGRA,
GL_UNSIGNED_INT_8_8_8_8_REV,
+ depth_bits_array,
stencil_bits_array,
+ 1, back_buffer_modes, 1);
+ configs = driConcatConfigs(configs_r5g6b5, configs_a8r8g8b8);
+ } else
+ configs = driCreateConfigs(GL_BGRA, GL_UNSIGNED_INT_8_8_8_8_REV,
+ depth_bits_array, stencil_bits_array,
+ depth_buffer_factor,
+ back_buffer_modes, back_buffer_factor);
-configs = driCreateConfigs(fb_format, fb_type,
- depth_bits_array, stencil_bits_array,
- depth_buffer_factor,
- back_buffer_modes, back_buffer_factor);
if (configs == NULL) {
fprintf( stderr, [%s:%u] Error creating FBConfig!\n,
__func__, __LINE__ );
___
mesa-commit mailing list
mesa-commit@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/mesa-commit
Mesa (gallium-mesa-7.4): mesa: replace = with when testing if we' ve exceeded max local params
Module: Mesa
Branch: gallium-mesa-7.4
Commit: 14f13fbcfabb699d0308feb88a528056f2b39c47
URL:
http://cgit.freedesktop.org/mesa/mesa/commit/?id=14f13fbcfabb699d0308feb88a528056f2b39c47
Author: Brian Paul bri...@vmware.com
Date: Tue Apr 7 08:34:04 2009 -0600
mesa: replace = with when testing if we've exceeded max local params
Now a program that uses 256 locals works as it should.
(cherry picked from master, commit a4173956ebcc224b5a0d76bace07b87bdf8bed03)
---
src/mesa/shader/arbprogparse.c |4 ++--
1 files changed, 2 insertions(+), 2 deletions(-)
diff --git a/src/mesa/shader/arbprogparse.c b/src/mesa/shader/arbprogparse.c
index a3a75c3..8b7b5b1 100644
--- a/src/mesa/shader/arbprogparse.c
+++ b/src/mesa/shader/arbprogparse.c
@@ -1908,10 +1908,10 @@ parse_param_elements (GLcontext * ctx, const GLubyte **
inst,
/* Make sure we haven't blown past our parameter limits */
if (((Program-Base.Target == GL_VERTEX_PROGRAM_ARB)
-(Program-Base.NumParameters =
+(Program-Base.NumParameters
ctx-Const.VertexProgram.MaxLocalParams))
|| ((Program-Base.Target == GL_FRAGMENT_PROGRAM_ARB)
-(Program-Base.NumParameters =
+(Program-Base.NumParameters
ctx-Const.FragmentProgram.MaxLocalParams))) {
program_error(ctx, Program-Position, Too many parameter variables);
return 1;
___
mesa-commit mailing list
mesa-commit@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/mesa-commit
Mesa (gallium-mesa-7.4): mesa: in mesa_add_named_constant(), avoid adding duplicate constants
Module: Mesa
Branch: gallium-mesa-7.4
Commit: 5c47d53924842e2389c31ac0f08f6cff68a9fd3b
URL:
http://cgit.freedesktop.org/mesa/mesa/commit/?id=5c47d53924842e2389c31ac0f08f6cff68a9fd3b
Author: Brian Paul bri...@vmware.com
Date: Fri Apr 3 15:42:14 2009 -0600
mesa: in mesa_add_named_constant(), avoid adding duplicate constants
(cherry picked from master, commit 80197a0c1bec48e3731bca975ec451d96f35f62a)
---
src/mesa/shader/prog_parameter.c | 19 ---
1 files changed, 12 insertions(+), 7 deletions(-)
diff --git a/src/mesa/shader/prog_parameter.c b/src/mesa/shader/prog_parameter.c
index dc48e84..b8202b5 100644
--- a/src/mesa/shader/prog_parameter.c
+++ b/src/mesa/shader/prog_parameter.c
@@ -178,15 +178,20 @@ _mesa_add_named_constant(struct gl_program_parameter_list
*paramList,
const char *name, const GLfloat values[4],
GLuint size)
{
-#if 0 /* disable this for now -- we need to save the name! */
+ /* first check if this is a duplicate constant */
GLint pos;
- GLuint swizzle;
- ASSERT(size == 4); /* XXX future feature */
- /* check if we already have this constant */
- if (_mesa_lookup_parameter_constant(paramList, values, 4, pos, swizzle)) {
- return pos;
+ for (pos = 0; pos paramList-NumParameters; pos++) {
+ const GLfloat *pvals = paramList-ParameterValues[pos];
+ if (pvals[0] == values[0]
+ pvals[1] == values[1]
+ pvals[2] == values[2]
+ pvals[3] == values[3]
+ _mesa_strcmp(paramList-Parameters[pos].Name, name) == 0) {
+ /* Same name and value is already in the param list - reuse it */
+ return pos;
+ }
}
-#endif
+ /* not found, add new parameter */
return _mesa_add_parameter(paramList, PROGRAM_CONSTANT, name,
size, GL_NONE, values, NULL, 0x0);
}
___
mesa-commit mailing list
mesa-commit@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/mesa-commit
Mesa (gallium-mesa-7.4): docs: more bug fixes for Mesa 7.4.1
Module: Mesa Branch: gallium-mesa-7.4 Commit: 7d3561c87155067fb6ec6587831bdac903ac4c6a URL: http://cgit.freedesktop.org/mesa/mesa/commit/?id=7d3561c87155067fb6ec6587831bdac903ac4c6a Author: Brian Paul bri...@vmware.com Date: Tue Apr 7 08:37:22 2009 -0600 docs: more bug fixes for Mesa 7.4.1 --- docs/relnotes-7.4.1.html |2 ++ 1 files changed, 2 insertions(+), 0 deletions(-) diff --git a/docs/relnotes-7.4.1.html b/docs/relnotes-7.4.1.html index d35095d..9f3e08d 100644 --- a/docs/relnotes-7.4.1.html +++ b/docs/relnotes-7.4.1.html @@ -42,6 +42,8 @@ tbd liIndexing the GLSL gl_EyePlane[] or gl_ObjectPlane[] arrays with a variable was broken, bug 20986 liFixed incorrect texture unit bias in TXB instruction +liglTexParameter settings weren't always propogated to drivers +liAssorted vertex/fragment program bug fixes /ul h2Changes/h2 ___ mesa-commit mailing list mesa-commit@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/mesa-commit
Mesa (gallium-mesa-7.4): Merge commit 'origin/mesa_7_4_branch' into gallium-mesa-7.4
Module: Mesa Branch: gallium-mesa-7.4 Commit: 99ad12636998705a2387382c9b0e4e40773c6c32 URL: http://cgit.freedesktop.org/mesa/mesa/commit/?id=99ad12636998705a2387382c9b0e4e40773c6c32 Author: Alan Hourihane al...@vmware.com Date: Tue Apr 7 15:40:52 2009 +0100 Merge commit 'origin/mesa_7_4_branch' into gallium-mesa-7.4 --- ___ mesa-commit mailing list mesa-commit@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/mesa-commit
Mesa (gallium-mesa-7.4): glsl: fix texgen state variable tokens in emit_statevars()
Module: Mesa
Branch: gallium-mesa-7.4
Commit: 4fa700260ef9121052bae5714e2ad187681947b0
URL:
http://cgit.freedesktop.org/mesa/mesa/commit/?id=4fa700260ef9121052bae5714e2ad187681947b0
Author: Brian Paul bri...@vmware.com
Date: Wed Apr 1 07:39:26 2009 -0600
glsl: fix texgen state variable tokens in emit_statevars()
This fixes broken variable indexing into the gl_Eye/ObjectPlaneS/T/R/Q arrays.
See bug 20986.
(cherry picked from master, commit f8dd6594bf1d597b883af44e5d724a181c1e2b53)
---
src/mesa/shader/slang/slang_builtin.c | 24
1 files changed, 16 insertions(+), 8 deletions(-)
diff --git a/src/mesa/shader/slang/slang_builtin.c
b/src/mesa/shader/slang/slang_builtin.c
index c0f4c79..5a67394 100644
--- a/src/mesa/shader/slang/slang_builtin.c
+++ b/src/mesa/shader/slang/slang_builtin.c
@@ -457,28 +457,36 @@ emit_statevars(const char *name, int array_len,
tokens[0] = STATE_TEXENV_COLOR;
}
else if (strcmp(name, gl_EyePlaneS) == 0) {
- tokens[0] = STATE_TEXGEN_EYE_S;
+ tokens[0] = STATE_TEXGEN;
+ tokens[2] = STATE_TEXGEN_EYE_S;
}
else if (strcmp(name, gl_EyePlaneT) == 0) {
- tokens[0] = STATE_TEXGEN_EYE_T;
+ tokens[0] = STATE_TEXGEN;
+ tokens[2] = STATE_TEXGEN_EYE_T;
}
else if (strcmp(name, gl_EyePlaneR) == 0) {
- tokens[0] = STATE_TEXGEN_EYE_R;
+ tokens[0] = STATE_TEXGEN;
+ tokens[2] = STATE_TEXGEN_EYE_R;
}
else if (strcmp(name, gl_EyePlaneQ) == 0) {
- tokens[0] = STATE_TEXGEN_EYE_Q;
+ tokens[0] = STATE_TEXGEN;
+ tokens[2] = STATE_TEXGEN_EYE_Q;
}
else if (strcmp(name, gl_ObjectPlaneS) == 0) {
- tokens[0] = STATE_TEXGEN_OBJECT_S;
+ tokens[0] = STATE_TEXGEN;
+ tokens[2] = STATE_TEXGEN_OBJECT_S;
}
else if (strcmp(name, gl_ObjectPlaneT) == 0) {
- tokens[0] = STATE_TEXGEN_OBJECT_T;
+ tokens[0] = STATE_TEXGEN;
+ tokens[2] = STATE_TEXGEN_OBJECT_T;
}
else if (strcmp(name, gl_ObjectPlaneR) == 0) {
- tokens[0] = STATE_TEXGEN_OBJECT_R;
+ tokens[0] = STATE_TEXGEN;
+ tokens[2] = STATE_TEXGEN_OBJECT_R;
}
else if (strcmp(name, gl_ObjectPlaneQ) == 0) {
- tokens[0] = STATE_TEXGEN_OBJECT_Q;
+ tokens[0] = STATE_TEXGEN;
+ tokens[2] = STATE_TEXGEN_OBJECT_Q;
}
else {
return -1; /* invalid array name */
___
mesa-commit mailing list
mesa-commit@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/mesa-commit
Mesa (gallium-mesa-7.4): docs: fix bug 20986
Module: Mesa Branch: gallium-mesa-7.4 Commit: 7f30aba920952fb1bff05488f9a1afa72e46e58d URL: http://cgit.freedesktop.org/mesa/mesa/commit/?id=7f30aba920952fb1bff05488f9a1afa72e46e58d Author: Brian Paul bri...@vmware.com Date: Wed Apr 1 07:39:43 2009 -0600 docs: fix bug 20986 --- docs/relnotes-7.4.1.html |2 ++ 1 files changed, 2 insertions(+), 0 deletions(-) diff --git a/docs/relnotes-7.4.1.html b/docs/relnotes-7.4.1.html index 41e1634..24efd52 100644 --- a/docs/relnotes-7.4.1.html +++ b/docs/relnotes-7.4.1.html @@ -39,6 +39,8 @@ tbd ul liFixed a two-sided lighting bug in fixed-function-to-GPU code generation liFixed some Darwin issues (Jeremy Huddleston) +liIndexing the GLSL gl_EyePlane[] or gl_ObjectPlane[] arrays with a variable +was broken, bug 20986 /ul h2Changes/h2 ___ mesa-commit mailing list mesa-commit@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/mesa-commit
Mesa (gallium-mesa-7.4): swrast: fix glDrawBuffer(GL_FRONT_AND_BACK)
Module: Mesa
Branch: gallium-mesa-7.4
Commit: 7511d76bd7240b85bdbcda6b955a029ab3b04046
URL:
http://cgit.freedesktop.org/mesa/mesa/commit/?id=7511d76bd7240b85bdbcda6b955a029ab3b04046
Author: Brian Paul bri...@vmware.com
Date: Thu Apr 2 13:07:53 2009 -0600
swrast: fix glDrawBuffer(GL_FRONT_AND_BACK)
We weren't putting the right colors into the back buffer in this mode.
(cherry picked from master, commit 9cc79fc2dcdd8e21d9616cc65a931f1f5859fc30)
---
src/mesa/swrast/s_span.c | 10 --
1 files changed, 8 insertions(+), 2 deletions(-)
diff --git a/src/mesa/swrast/s_span.c b/src/mesa/swrast/s_span.c
index e36c1a4..f07014f 100644
--- a/src/mesa/swrast/s_span.c
+++ b/src/mesa/swrast/s_span.c
@@ -1399,11 +1399,17 @@ _swrast_write_rgba_span( GLcontext *ctx, SWspan *span)
}
/*
-* Write to renderbuffers
+* Write to renderbuffers.
+* Depending on glDrawBuffer() state and the which color outputs are
+* written by the fragment shader, we may either replicate one color to
+* all renderbuffers or write a different color to each renderbuffer.
+* multiFragOutputs=TRUE for the later case.
*/
{
const GLuint numBuffers = fb-_NumColorDrawBuffers;
- const GLboolean multiFragOutputs = numBuffers 1;
+ const struct gl_fragment_program *fp = ctx-FragmentProgram._Current;
+ const GLboolean multiFragOutputs =
+ (fp fp-Base.OutputsWritten = (1 FRAG_RESULT_DATA0));
GLuint buf;
for (buf = 0; buf numBuffers; buf++) {
___
mesa-commit mailing list
mesa-commit@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/mesa-commit
Mesa (gallium-mesa-7.4): mesa: use correct tex unit lod bias for TXB instruction
Module: Mesa
Branch: gallium-mesa-7.4
Commit: 0590edeea038659d18332b61c504ccf6e97fe7fc
URL:
http://cgit.freedesktop.org/mesa/mesa/commit/?id=0590edeea038659d18332b61c504ccf6e97fe7fc
Author: Brian Paul bri...@vmware.com
Date: Thu Apr 2 13:09:32 2009 -0600
mesa: use correct tex unit lod bias for TXB instruction
(cherry picked from master, commit 1ab225017ed1ea8bd9e266d10ee56ab914bb28c1)
---
src/mesa/shader/prog_execute.c |4 ++--
1 files changed, 2 insertions(+), 2 deletions(-)
diff --git a/src/mesa/shader/prog_execute.c b/src/mesa/shader/prog_execute.c
index a93733c..6a79cf4 100644
--- a/src/mesa/shader/prog_execute.c
+++ b/src/mesa/shader/prog_execute.c
@@ -1577,8 +1577,8 @@ _mesa_execute_program(GLcontext * ctx,
case OPCODE_TXB: /* GL_ARB_fragment_program only */
/* Texel lookup with LOD bias */
{
-const struct gl_texture_unit *texUnit
- = ctx-Texture.Unit[inst-TexSrcUnit];
+const GLuint unit = machine-Samplers[inst-TexSrcUnit];
+const struct gl_texture_unit *texUnit = ctx-Texture.Unit[unit];
GLfloat texcoord[4], color[4], lodBias;
fetch_vector4(inst-SrcReg[0], machine, texcoord);
___
mesa-commit mailing list
mesa-commit@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/mesa-commit
Mesa (gallium-mesa-7.4): mesa: don't call ctx-Driver.Draw/CopyPixels() if width or height is zero
Module: Mesa
Branch: gallium-mesa-7.4
Commit: 2b33b77337813399f869c6f3d96401b9a48a586d
URL:
http://cgit.freedesktop.org/mesa/mesa/commit/?id=2b33b77337813399f869c6f3d96401b9a48a586d
Author: Brian Paul bri...@vmware.com
Date: Thu Apr 2 13:10:41 2009 -0600
mesa: don't call ctx-Driver.Draw/CopyPixels() if width or height is zero
(cherry picked from master, commit f6a3f1f52a969c8d990a3a41e816af4864eea45c)
---
src/mesa/main/drawpix.c | 52 +-
1 files changed, 28 insertions(+), 24 deletions(-)
diff --git a/src/mesa/main/drawpix.c b/src/mesa/main/drawpix.c
index ac97bc1..cb837de 100644
--- a/src/mesa/main/drawpix.c
+++ b/src/mesa/main/drawpix.c
@@ -77,28 +77,30 @@ _mesa_DrawPixels( GLsizei width, GLsizei height,
}
if (ctx-RenderMode == GL_RENDER) {
- /* Round, to satisfy conformance tests (matches SGI's OpenGL) */
- GLint x = IROUND(ctx-Current.RasterPos[0]);
- GLint y = IROUND(ctx-Current.RasterPos[1]);
-
- if (ctx-Unpack.BufferObj-Name) {
- /* unpack from PBO */
- if (!_mesa_validate_pbo_access(2, ctx-Unpack, width, height, 1,
-format, type, pixels)) {
-_mesa_error(ctx, GL_INVALID_OPERATION,
-glDrawPixels(invalid PBO access));
-return;
+ if (width 0 height 0) {
+ /* Round, to satisfy conformance tests (matches SGI's OpenGL) */
+ GLint x = IROUND(ctx-Current.RasterPos[0]);
+ GLint y = IROUND(ctx-Current.RasterPos[1]);
+
+ if (ctx-Unpack.BufferObj-Name) {
+/* unpack from PBO */
+if (!_mesa_validate_pbo_access(2, ctx-Unpack, width, height, 1,
+ format, type, pixels)) {
+ _mesa_error(ctx, GL_INVALID_OPERATION,
+ glDrawPixels(invalid PBO access));
+ return;
+}
+if (ctx-Unpack.BufferObj-Pointer) {
+ /* buffer is mapped - that's an error */
+ _mesa_error(ctx, GL_INVALID_OPERATION,
+ glDrawPixels(PBO is mapped));
+ return;
+}
}
- if (ctx-Unpack.BufferObj-Pointer) {
-/* buffer is mapped - that's an error */
-_mesa_error(ctx, GL_INVALID_OPERATION,
-glDrawPixels(PBO is mapped));
-return;
- }
- }
- ctx-Driver.DrawPixels(ctx, x, y, width, height, format, type,
-ctx-Unpack, pixels);
+ ctx-Driver.DrawPixels(ctx, x, y, width, height, format, type,
+ctx-Unpack, pixels);
+ }
}
else if (ctx-RenderMode == GL_FEEDBACK) {
/* Feedback the current raster pos info */
@@ -159,10 +161,12 @@ _mesa_CopyPixels( GLint srcx, GLint srcy, GLsizei width,
GLsizei height,
if (ctx-RenderMode == GL_RENDER) {
/* Round to satisfy conformance tests (matches SGI's OpenGL) */
- GLint destx = IROUND(ctx-Current.RasterPos[0]);
- GLint desty = IROUND(ctx-Current.RasterPos[1]);
- ctx-Driver.CopyPixels( ctx, srcx, srcy, width, height, destx, desty,
- type );
+ if (width 0 height 0) {
+ GLint destx = IROUND(ctx-Current.RasterPos[0]);
+ GLint desty = IROUND(ctx-Current.RasterPos[1]);
+ ctx-Driver.CopyPixels( ctx, srcx, srcy, width, height, destx, desty,
+ type );
+ }
}
else if (ctx-RenderMode == GL_FEEDBACK) {
FLUSH_CURRENT( ctx, 0 );
___
mesa-commit mailing list
mesa-commit@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/mesa-commit
Mesa (gallium-mesa-7.4): mesa: don't call ctx-Driver.ReadPixels() if width or height is zero
Module: Mesa
Branch: gallium-mesa-7.4
Commit: 6ef0951b174b7eda71ccf4a7ac4881df62829843
URL:
http://cgit.freedesktop.org/mesa/mesa/commit/?id=6ef0951b174b7eda71ccf4a7ac4881df62829843
Author: Brian Paul bri...@vmware.com
Date: Thu Apr 2 13:11:33 2009 -0600
mesa: don't call ctx-Driver.ReadPixels() if width or height is zero
(cherry picked from commit master, 7b9bf395433b5fa9d5a95186891a29d49e0b47c0)
---
src/mesa/main/readpix.c |3 +++
1 files changed, 3 insertions(+), 0 deletions(-)
diff --git a/src/mesa/main/readpix.c b/src/mesa/main/readpix.c
index dfdd297..2326776 100644
--- a/src/mesa/main/readpix.c
+++ b/src/mesa/main/readpix.c
@@ -170,6 +170,9 @@ _mesa_ReadPixels( GLint x, GLint y, GLsizei width, GLsizei
height,
return;
}
+ if (width == 0 || height == 0)
+ return; /* nothing to do */
+
if (ctx-Pack.BufferObj-Name) {
if (!_mesa_validate_pbo_access(2, ctx-Pack, width, height, 1,
format, type, pixels)) {
___
mesa-commit mailing list
mesa-commit@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/mesa-commit
Mesa (gallium-mesa-7.4): docs: fix TXB texture unit bias error
Module: Mesa Branch: gallium-mesa-7.4 Commit: 8c9d7b2474d23ff7c8d7a6f7ecfe3ba7c9d1ccb6 URL: http://cgit.freedesktop.org/mesa/mesa/commit/?id=8c9d7b2474d23ff7c8d7a6f7ecfe3ba7c9d1ccb6 Author: Brian Paul bri...@vmware.com Date: Thu Apr 2 13:11:56 2009 -0600 docs: fix TXB texture unit bias error --- docs/relnotes-7.4.1.html |1 + 1 files changed, 1 insertions(+), 0 deletions(-) diff --git a/docs/relnotes-7.4.1.html b/docs/relnotes-7.4.1.html index 24efd52..d35095d 100644 --- a/docs/relnotes-7.4.1.html +++ b/docs/relnotes-7.4.1.html @@ -41,6 +41,7 @@ tbd liFixed some Darwin issues (Jeremy Huddleston) liIndexing the GLSL gl_EyePlane[] or gl_ObjectPlane[] arrays with a variable was broken, bug 20986 +liFixed incorrect texture unit bias in TXB instruction /ul h2Changes/h2 ___ mesa-commit mailing list mesa-commit@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/mesa-commit
Mesa (gallium-mesa-7.4): mesa: fix TexParameter functions
Module: Mesa
Branch: gallium-mesa-7.4
Commit: 7be149cfd131c0b3f7d4337bb83e6fba5f563bf9
URL:
http://cgit.freedesktop.org/mesa/mesa/commit/?id=7be149cfd131c0b3f7d4337bb83e6fba5f563bf9
Author: Roland Scheidegger srol...@vmware.com
Date: Thu Apr 2 23:38:34 2009 +0200
mesa: fix TexParameter functions
premature return in TexParameterf caused mesa to never call Driver.TexParameter
breaking drivers relying on this (fix bug #20966).
While here, also fix using ctx-ErrorValue when deciding to call
Driver.TexParameter. Errors are sticky and uncleared errors thus would cause
this to no longer get called. Since we thus need return value of
set_tex_parameter[if] can also optimize this to only call when value changed.
---
src/mesa/main/texparam.c | 140 +++---
1 files changed, 82 insertions(+), 58 deletions(-)
diff --git a/src/mesa/main/texparam.c b/src/mesa/main/texparam.c
index be4fc1d..e89bc5f 100644
--- a/src/mesa/main/texparam.c
+++ b/src/mesa/main/texparam.c
@@ -139,8 +139,11 @@ flush(GLcontext *ctx, struct gl_texture_object *texObj)
}
-/** Set an integer-valued texture parameter */
-static void
+/**
+ * Set an integer-valued texture parameter
+ * \return GL_TRUE if legal AND the value changed, GL_FALSE otherwise
+ */
+static GLboolean
set_tex_parameteri(GLcontext *ctx,
struct gl_texture_object *texObj,
GLenum pname, const GLint *params)
@@ -148,13 +151,13 @@ set_tex_parameteri(GLcontext *ctx,
switch (pname) {
case GL_TEXTURE_MIN_FILTER:
if (texObj-MinFilter == params[0])
- return;
+ return GL_FALSE;
switch (params[0]) {
case GL_NEAREST:
case GL_LINEAR:
flush(ctx, texObj);
texObj-MinFilter = params[0];
- return;
+ return GL_TRUE;
case GL_NEAREST_MIPMAP_NEAREST:
case GL_LINEAR_MIPMAP_NEAREST:
case GL_NEAREST_MIPMAP_LINEAR:
@@ -162,77 +165,80 @@ set_tex_parameteri(GLcontext *ctx,
if (texObj-Target != GL_TEXTURE_RECTANGLE_NV) {
flush(ctx, texObj);
texObj-MinFilter = params[0];
-return;
+return GL_TRUE;
}
/* fall-through */
default:
_mesa_error( ctx, GL_INVALID_VALUE, glTexParameter(param) );
}
- return;
+ return GL_FALSE;
case GL_TEXTURE_MAG_FILTER:
if (texObj-MagFilter == params[0])
- return;
+ return GL_FALSE;
switch (params[0]) {
case GL_NEAREST:
case GL_LINEAR:
flush(ctx, texObj);
texObj-MagFilter = params[0];
- return;
+ return GL_TRUE;
default:
_mesa_error( ctx, GL_INVALID_VALUE, glTexParameter(param) );
}
- return;
+ return GL_FALSE;
case GL_TEXTURE_WRAP_S:
if (texObj-WrapS == params[0])
- return;
+ return GL_FALSE;
if (validate_texture_wrap_mode(ctx, texObj-Target, params[0])) {
flush(ctx, texObj);
texObj-WrapS = params[0];
+ return GL_TRUE;
}
- return;
+ return GL_FALSE;
case GL_TEXTURE_WRAP_T:
if (texObj-WrapT == params[0])
- return;
+ return GL_FALSE;
if (validate_texture_wrap_mode(ctx, texObj-Target, params[0])) {
flush(ctx, texObj);
texObj-WrapT = params[0];
+ return GL_TRUE;
}
- return;
+ return GL_FALSE;
case GL_TEXTURE_WRAP_R:
if (texObj-WrapR == params[0])
- return;
+ return GL_FALSE;
if (validate_texture_wrap_mode(ctx, texObj-Target, params[0])) {
flush(ctx, texObj);
texObj-WrapR = params[0];
+ return GL_TRUE;
}
- return;
+ return GL_FALSE;
case GL_TEXTURE_BASE_LEVEL:
if (texObj-BaseLevel == params[0])
- return;
+ return GL_FALSE;
if (params[0] 0 ||
(texObj-Target == GL_TEXTURE_RECTANGLE_ARB params[0] != 0)) {
_mesa_error(ctx, GL_INVALID_VALUE, glTexParameter(param));
- return;
+ return GL_FALSE;
}
flush(ctx, texObj);
texObj-BaseLevel = params[0];
- return;
+ return GL_TRUE;
case GL_TEXTURE_MAX_LEVEL:
if (texObj-MaxLevel == params[0])
- return;
+ return GL_FALSE;
if (params[0] 0 || texObj-Target == GL_TEXTURE_RECTANGLE_ARB) {
_mesa_error(ctx, GL_INVALID_OPERATION, glTexParameter(param));
- return;
+ return GL_FALSE;
}
flush(ctx, texObj);
texObj-MaxLevel = params[0];
- return;
+ return GL_TRUE;
case GL_TEXTURE_COMPARE_SGIX:
if (ctx-Extensions.SGIX_shadow) {
@@ -243,7 +249,7 @@ set_tex_parameteri(GLcontext *ctx,
_mesa_error(ctx, GL_INVALID_ENUM,
glTexParameter(pname=GL_TEXTURE_COMPARE_SGIX));
}
- return;
+ return GL_TRUE;
case GL_TEXTURE_COMPARE_OPERATOR_SGIX:
Mesa (gallium-mesa-7.4): Merge commit 'origin/mesa_7_4_branch' into gallium-mesa-7.4
Module: Mesa Branch: gallium-mesa-7.4 Commit: eb1970b725d8931ecbdada96bc3035ed1239a367 URL: http://cgit.freedesktop.org/mesa/mesa/commit/?id=eb1970b725d8931ecbdada96bc3035ed1239a367 Author: Alan Hourihane al...@vmware.com Date: Fri Apr 3 09:26:18 2009 +0100 Merge commit 'origin/mesa_7_4_branch' into gallium-mesa-7.4 Conflicts: src/mesa/main/texparam.c --- ___ mesa-commit mailing list mesa-commit@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/mesa-commit
Mesa (master): mesa: ensure pbo stencil buffers are mapped before use
Module: Mesa
Branch: master
Commit: f7039fde4f9e1175c3dae534e5b91e22e693124a
URL:
http://cgit.freedesktop.org/mesa/mesa/commit/?id=f7039fde4f9e1175c3dae534e5b91e22e693124a
Author: Alan Hourihane al...@vmware.com
Date: Fri Apr 3 12:49:05 2009 +0100
mesa: ensure pbo stencil buffers are mapped before use
---
src/mesa/state_tracker/st_cb_drawpixels.c |5 +
1 files changed, 5 insertions(+), 0 deletions(-)
diff --git a/src/mesa/state_tracker/st_cb_drawpixels.c
b/src/mesa/state_tracker/st_cb_drawpixels.c
index f9f139f..8926aa3 100644
--- a/src/mesa/state_tracker/st_cb_drawpixels.c
+++ b/src/mesa/state_tracker/st_cb_drawpixels.c
@@ -640,6 +640,9 @@ draw_stencil_pixels(GLcontext *ctx, GLint x, GLint y,
stmap = screen-transfer_map(screen, pt);
+ pixels = _mesa_map_drawpix_pbo(ctx, unpack, pixels);
+ assert(pixels);
+
/* if width MAX_WIDTH, have to process image in chunks */
skipPixels = 0;
while (skipPixels width) {
@@ -705,6 +708,8 @@ draw_stencil_pixels(GLcontext *ctx, GLint x, GLint y,
skipPixels += spanWidth;
}
+ _mesa_unmap_drawpix_pbo(ctx, unpack);
+
/* unmap the stencil buffer */
screen-transfer_unmap(screen, pt);
screen-tex_transfer_destroy(pt);
___
mesa-commit mailing list
mesa-commit@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/mesa-commit
Mesa (gallium-mesa-7.4): mesa: ensure pbo stencil buffers are mapped before use
Module: Mesa
Branch: gallium-mesa-7.4
Commit: 151b5385b640fa8e38406a569640ac57e53860a1
URL:
http://cgit.freedesktop.org/mesa/mesa/commit/?id=151b5385b640fa8e38406a569640ac57e53860a1
Author: Alan Hourihane al...@vmware.com
Date: Fri Apr 3 12:49:05 2009 +0100
mesa: ensure pbo stencil buffers are mapped before use
---
src/mesa/state_tracker/st_cb_drawpixels.c |5 +
1 files changed, 5 insertions(+), 0 deletions(-)
diff --git a/src/mesa/state_tracker/st_cb_drawpixels.c
b/src/mesa/state_tracker/st_cb_drawpixels.c
index 32bf214..6ecabab 100644
--- a/src/mesa/state_tracker/st_cb_drawpixels.c
+++ b/src/mesa/state_tracker/st_cb_drawpixels.c
@@ -756,6 +756,9 @@ draw_stencil_pixels(GLcontext *ctx, GLint x, GLint y,
stmap = screen-surface_map(screen, ps,
PIPE_BUFFER_USAGE_CPU_WRITE);
+ pixels = _mesa_map_drawpix_pbo(ctx, unpack, pixels);
+ assert(pixels);
+
/* if width MAX_WIDTH, have to process image in chunks */
skipPixels = 0;
while (skipPixels width) {
@@ -810,6 +813,8 @@ draw_stencil_pixels(GLcontext *ctx, GLint x, GLint y,
skipPixels += spanWidth;
}
+ _mesa_unmap_drawpix_pbo(ctx, unpack);
+
/* unmap the stencil buffer */
screen-surface_unmap(screen, ps);
pipe_surface_reference(ps, NULL);
___
mesa-commit mailing list
mesa-commit@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/mesa-commit
Mesa (gallium-mesa-7.4): mesa: disable CELL define as it' s in the config if enabled
Module: Mesa Branch: gallium-mesa-7.4 Commit: 98e983aeb6028c9d637336b4456d7d4c75225592 URL: http://cgit.freedesktop.org/mesa/mesa/commit/?id=98e983aeb6028c9d637336b4456d7d4c75225592 Author: Alan Hourihane al...@vmware.com Date: Thu Apr 2 11:57:06 2009 +0100 mesa: disable CELL define as it's in the config if enabled --- src/gallium/winsys/xlib/Makefile |1 - 1 files changed, 0 insertions(+), 1 deletions(-) diff --git a/src/gallium/winsys/xlib/Makefile b/src/gallium/winsys/xlib/Makefile index 5b71e6d..7338df7 100644 --- a/src/gallium/winsys/xlib/Makefile +++ b/src/gallium/winsys/xlib/Makefile @@ -24,7 +24,6 @@ INCLUDE_DIRS = \ DEFINES = \ -DGALLIUM_SOFTPIPE \ - -DGALLIUM_CELL \ -DGALLIUM_TRACE \ -DGALLIUM_BRW ___ mesa-commit mailing list mesa-commit@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/mesa-commit
Mesa (gallium-mesa-7.4): Updated darwin config for when X11 is not in the same location as we' re installing to
Module: Mesa Branch: gallium-mesa-7.4 Commit: 6cb796f6fcfd1621a431efb7cb88313abad728d9 URL: http://cgit.freedesktop.org/mesa/mesa/commit/?id=6cb796f6fcfd1621a431efb7cb88313abad728d9 Author: Jeremy Huddleston jerem...@freedesktop.org Date: Fri Mar 6 11:20:21 2009 -0500 Updated darwin config for when X11 is not in the same location as we're installing to (cherry picked from commit 7817fea0b675686dd6b4c29c9a55b1304a3571d7) --- configs/darwin | 14 -- 1 files changed, 8 insertions(+), 6 deletions(-) diff --git a/configs/darwin b/configs/darwin index 77edf1a..f061500 100644 --- a/configs/darwin +++ b/configs/darwin @@ -6,6 +6,8 @@ CONFIG_NAME = darwin INSTALL_DIR = /usr/X11 +X11_DIR = $(INSTALL_DIR) + # Compiler and flags CC = gcc CXX = gcc @@ -21,9 +23,9 @@ DEFINES = -D_DARWIN_C_SOURCE -D_POSIX_SOURCE -D_POSIX_C_SOURCE=199309L \ ARCH_FLAGS += $(RC_CFLAGS) CFLAGS = -ggdb3 -Os -Wall -Wmissing-prototypes -std=c99 -ffast-math -fno-strict-aliasing \ - -I$(INSTALL_DIR)/include $(OPT_FLAGS) $(PIC_FLAGS) $(ARCH_FLAGS) $(ASM_FLAGS) $(DEFINES) + -I$(INSTALL_DIR)/include -I$(X11_DIR)/include $(OPT_FLAGS) $(PIC_FLAGS) $(ARCH_FLAGS) $(ASM_FLAGS) $(DEFINES) CXXFLAGS = -ggdb3 -Os -Wall -fno-strict-aliasing \ - -I$(INSTALL_DIR)/include $(OPT_FLAGS) $(PIC_FLAGS) $(ARCH_FLAGS) $(ASM_FLAGS) $(DEFINES) + -I$(INSTALL_DIR)/include -I$(X11_DIR)/include $(OPT_FLAGS) $(PIC_FLAGS) $(ARCH_FLAGS) $(ASM_FLAGS) $(DEFINES) # Library names (actual file names) GL_LIB_NAME = libGL.dylib @@ -39,12 +41,12 @@ GLUT_LIB_GLOB = libglut.*dylib GLW_LIB_GLOB = libGLw.*dylib OSMESA_LIB_GLOB = libOSMesa.*dylib -GL_LIB_DEPS = -L$(INSTALL_DIR)/$(LIB_DIR) -lX11 -lXext -lm -lpthread +GL_LIB_DEPS = -L$(INSTALL_DIR)/$(LIB_DIR) -L$(X11_DIR)/$(LIB_DIR) -lX11 -lXext -lm -lpthread OSMESA_LIB_DEPS = -L$(TOP)/$(LIB_DIR) -l$(GL_LIB) GLU_LIB_DEPS = -L$(TOP)/$(LIB_DIR) -l$(GL_LIB) -GLUT_LIB_DEPS = -L$(TOP)/$(LIB_DIR) -l$(GLU_LIB) -l$(GL_LIB) -L$(INSTALL_DIR)/$(LIB_DIR) -lX11 -lXmu -lXi -lXext -GLW_LIB_DEPS = -L$(TOP)/$(LIB_DIR) -l$(GL_LIB) -L$(INSTALL_DIR)/$(LIB_DIR) -lX11 -lXt -APP_LIB_DEPS = -L$(TOP)/lib -l$(GLUT_LIB) -l$(GLU_LIB) -l$(GL_LIB) -L$(INSTALL_DIR)/$(LIB_DIR) -lX11 -lXmu -lXt -lXi -lm +GLUT_LIB_DEPS = -L$(TOP)/$(LIB_DIR) -l$(GLU_LIB) -l$(GL_LIB) -L$(INSTALL_DIR)/$(LIB_DIR) -L$(X11_DIR)/$(LIB_DIR) -lX11 -lXmu -lXi -lXext +GLW_LIB_DEPS = -L$(TOP)/$(LIB_DIR) -l$(GL_LIB) -L$(INSTALL_DIR)/$(LIB_DIR) -L$(X11_DIR)/$(LIB_DIR) -lX11 -lXt +APP_LIB_DEPS = -L$(TOP)/$(LIB_DIR) -l$(GLUT_LIB) -l$(GLU_LIB) -l$(GL_LIB) -L$(INSTALL_DIR)/$(LIB_DIR) -L$(X11_DIR)/$(LIB_DIR) -lX11 -lXmu -lXt -lXi -lm # omit glw lib for now: SRC_DIRS = glx/x11 mesa glu glut/glx ___ mesa-commit mailing list mesa-commit@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/mesa-commit
Mesa (gallium-mesa-7.4): Fix compiling indirect. c when GLX_DIRECT_RENDERING is not defined
Module: Mesa
Branch: gallium-mesa-7.4
Commit: b65bc1b6cb72df950c2e26446936804dfcdc432c
URL:
http://cgit.freedesktop.org/mesa/mesa/commit/?id=b65bc1b6cb72df950c2e26446936804dfcdc432c
Author: Jeremy Huddleston jer...@yuffie.local
Date: Tue Mar 31 14:48:19 2009 -0700
Fix compiling indirect.c when GLX_DIRECT_RENDERING is not defined
---
src/glx/x11/indirect.c | 60
1 files changed, 60 insertions(+), 0 deletions(-)
diff --git a/src/glx/x11/indirect.c b/src/glx/x11/indirect.c
index 08d52ae..aea117e 100644
--- a/src/glx/x11/indirect.c
+++ b/src/glx/x11/indirect.c
@@ -5198,9 +5198,13 @@ glDeleteTexturesEXT(GLsizei n, const GLuint * textures)
{
__GLXcontext *const gc = __glXGetCurrentContext();
+#ifdef GLX_DIRECT_RENDERING
if (gc-driContext) {
CALL_DeleteTextures(GET_DISPATCH(), (n, textures));
} else {
+#else
+{
+#endif
__GLXcontext *const gc = __glXGetCurrentContext();
Display *const dpy = gc-currentDpy;
const GLuint cmdlen = 4 + __GLX_PAD((n * 4));
@@ -5266,9 +5270,13 @@ glGenTexturesEXT(GLsizei n, GLuint * textures)
{
__GLXcontext *const gc = __glXGetCurrentContext();
+#ifdef GLX_DIRECT_RENDERING
if (gc-driContext) {
CALL_GenTextures(GET_DISPATCH(), (n, textures));
} else {
+#else
+{
+#endif
__GLXcontext *const gc = __glXGetCurrentContext();
Display *const dpy = gc-currentDpy;
const GLuint cmdlen = 4;
@@ -5328,9 +5336,13 @@ glIsTextureEXT(GLuint texture)
{
__GLXcontext *const gc = __glXGetCurrentContext();
+#ifdef GLX_DIRECT_RENDERING
if (gc-driContext) {
return CALL_IsTexture(GET_DISPATCH(), (texture));
} else {
+#else
+{
+#endif
__GLXcontext *const gc = __glXGetCurrentContext();
Display *const dpy = gc-currentDpy;
GLboolean retval = (GLboolean) 0;
@@ -5641,9 +5653,13 @@ glGetColorTableEXT(GLenum target, GLenum format, GLenum
type, GLvoid * table)
{
__GLXcontext *const gc = __glXGetCurrentContext();
+#ifdef GLX_DIRECT_RENDERING
if (gc-driContext) {
CALL_GetColorTable(GET_DISPATCH(), (target, format, type, table));
} else {
+#else
+{
+#endif
__GLXcontext *const gc = __glXGetCurrentContext();
const __GLXattribute *const state = gc-client_state_private;
Display *const dpy = gc-currentDpy;
@@ -5714,10 +5730,14 @@ glGetColorTableParameterfvEXT(GLenum target, GLenum
pname, GLfloat * params)
{
__GLXcontext *const gc = __glXGetCurrentContext();
+#ifdef GLX_DIRECT_RENDERING
if (gc-driContext) {
CALL_GetColorTableParameterfv(GET_DISPATCH(),
(target, pname, params));
} else {
+#else
+{
+#endif
__GLXcontext *const gc = __glXGetCurrentContext();
Display *const dpy = gc-currentDpy;
const GLuint cmdlen = 8;
@@ -5784,10 +5804,14 @@ glGetColorTableParameterivEXT(GLenum target, GLenum
pname, GLint * params)
{
__GLXcontext *const gc = __glXGetCurrentContext();
+#ifdef GLX_DIRECT_RENDERING
if (gc-driContext) {
CALL_GetColorTableParameteriv(GET_DISPATCH(),
(target, pname, params));
} else {
+#else
+{
+#endif
__GLXcontext *const gc = __glXGetCurrentContext();
Display *const dpy = gc-currentDpy;
const GLuint cmdlen = 8;
@@ -6107,10 +6131,14 @@ gl_dispatch_stub_356(GLenum target, GLenum format,
GLenum type,
{
__GLXcontext *const gc = __glXGetCurrentContext();
+#ifdef GLX_DIRECT_RENDERING
if (gc-driContext) {
CALL_GetConvolutionFilter(GET_DISPATCH(),
(target, format, type, image));
} else {
+#else
+{
+#endif
__GLXcontext *const gc = __glXGetCurrentContext();
const __GLXattribute *const state = gc-client_state_private;
Display *const dpy = gc-currentDpy;
@@ -6182,10 +6210,14 @@ gl_dispatch_stub_357(GLenum target, GLenum pname,
GLfloat * params)
{
__GLXcontext *const gc = __glXGetCurrentContext();
+#ifdef GLX_DIRECT_RENDERING
if (gc-driContext) {
CALL_GetConvolutionParameterfv(GET_DISPATCH(),
(target, pname, params));
} else {
+#else
+{
+#endif
__GLXcontext *const gc = __glXGetCurrentContext();
Display *const dpy = gc-currentDpy;
const GLuint cmdlen = 8;
@@ -6252,10 +6284,14 @@ gl_dispatch_stub_358(GLenum target, GLenum pname, GLint
* params)
{
__GLXcontext *const gc = __glXGetCurrentContext();
+#ifdef GLX_DIRECT_RENDERING
if (gc-driContext) {
CALL_GetConvolutionParameteriv(GET_DISPATCH(),
(target, pname, params));
} else {
+#else
+{
+#endif
__GLXcontext *const gc = __glXGetCurrentContext();
Display *const dpy = gc-currentDpy;
