mesa: Branch 'master' - 7 commits
Brian Paul
brianp at kemper.freedesktop.org
Sat Apr 7 14:48:14 UTC 2007
Makefile | 13 ++++++-------
progs/util/extfuncs.h | 4 ++++
src/mesa/swrast/s_context.c | 4 ++--
src/mesa/swrast/s_span.c | 2 +-
src/mesa/swrast/s_tritemp.h | 6 +++---
src/mesa/swrast/s_zoom.c | 4 ++--
src/mesa/vbo/vbo_exec_api.c | 4 ++--
src/mesa/vbo/vbo_exec_eval.c | 4 ++--
8 files changed, 22 insertions(+), 19 deletions(-)
New commits:
diff-tree 55000888b9d1dcbf477d23afd16974450828a143 (from 4f9d3a07bbe731709e6819448d21dee609a37806)
Author: Richard Hughes <hughsient at gmail.com>
Date: Sat Apr 7 08:48:07 2007 -0600
set version for tarballs to 6.5.3pre for now
diff --git a/Makefile b/Makefile
index d6a3486..5e0c012 100644
--- a/Makefile
+++ b/Makefile
@@ -155,10 +155,10 @@ ultrix-gcc:
# Rules for making release tarballs
-DIRECTORY = Mesa-6.5.2
-LIB_NAME = MesaLib-6.5.2
-DEMO_NAME = MesaDemos-6.5.2
-GLUT_NAME = MesaGLUT-6.5.2
+DIRECTORY = Mesa-6.5.3pre
+LIB_NAME = MesaLib-6.5.3pre
+DEMO_NAME = MesaDemos-6.5.3pre
+GLUT_NAME = MesaGLUT-6.5.3pre
MAIN_FILES = \
$(DIRECTORY)/Makefile* \
diff-tree 4f9d3a07bbe731709e6819448d21dee609a37806 (from 84803279ca83a21d830a76764c25e26e01e7ebc2)
Author: Richard Hughes <hughsient at gmail.com>
Date: Sat Apr 7 08:46:44 2007 -0600
fix references to non-existant sz4 field
diff --git a/src/mesa/swrast/s_context.c b/src/mesa/swrast/s_context.c
index 00702b4..e113adb 100644
--- a/src/mesa/swrast/s_context.c
+++ b/src/mesa/swrast/s_context.c
@@ -786,8 +786,8 @@ _swrast_CreateContext( GLcontext *ctx )
swrast->SpanArrays->rgba = swrast->SpanArrays->color.sz2.rgba;
swrast->SpanArrays->spec = swrast->SpanArrays->color.sz2.spec;
#else
- swrast->SpanArrays->rgba = swrast->SpanArrays->color.sz4.rgba;
- swrast->SpanArrays->spec = swrast->SpanArrays->color.sz4.spec;
+ swrast->SpanArrays->rgba = swrast->SpanArrays->attribs[FRAG_ATTRIB_COL0];
+ swrast->SpanArrays->spec = swrast->SpanArrays->attribs[FRAG_ATTRIB_COL1];
#endif
/* init point span buffer */
diff --git a/src/mesa/swrast/s_zoom.c b/src/mesa/swrast/s_zoom.c
index 9bec0bb..1fac749 100644
--- a/src/mesa/swrast/s_zoom.c
+++ b/src/mesa/swrast/s_zoom.c
@@ -153,8 +153,8 @@ zoom_span( GLcontext *ctx, GLint imgX, G
zoomed_arrays.rgba = zoomed_arrays.color.sz2.rgba;
zoomed_arrays.spec = zoomed_arrays.color.sz2.spec;
#else
- zoomed_arrays.rgba = zoomed_arrays.color.sz4.rgba;
- zoomed_arrays.spec = zoomed_arrays.color.sz4.spec;
+ zoomed_arrays.rgba = zoomed_arrays.attribs[FRAG_ATTRIB_COL0];
+ zoomed_arrays.spec = zoomed_arrays.attribs[FRAG_ATTRIB_COL1];
#endif
diff-tree 84803279ca83a21d830a76764c25e26e01e7ebc2 (from 8d2d6e5194fb49619ed5125d95f8619bdf3b8106)
Author: Richard Hughes <hughsient at gmail.com>
Date: Sat Apr 7 08:46:10 2007 -0600
fix some CHAN_TYPE==GL_FLOAT breakage
diff --git a/src/mesa/swrast/s_tritemp.h b/src/mesa/swrast/s_tritemp.h
index c2b757f..b25d3d1 100644
--- a/src/mesa/swrast/s_tritemp.h
+++ b/src/mesa/swrast/s_tritemp.h
@@ -561,9 +561,9 @@ static void NAME(GLcontext *ctx, const S
span.attrStepX[FRAG_ATTRIB_COL1][2] = oneOverArea * (eMaj_dsb * eBot.dy - eMaj.dy * eBot_dsb);
span.attrStepY[FRAG_ATTRIB_COL1][2] = oneOverArea * (eMaj.dx * eBot_dsb - eMaj_dsb * eBot.dx);
# if CHAN_TYPE == GL_FLOAT
- span.specRedStep = span.attrStep[FRAG_ATTRIB_COL1][0];
- span.specGreenStep = span.dsgdx;
- span.specBlueStep = span.dsbdx;
+ span.specRedStep = span.attrStepX[FRAG_ATTRIB_COL1][0];
+ span.specGreenStep = span.attrStepX[FRAG_ATTRIB_COL1][1];
+ span.specBlueStep = span.attrStepX[FRAG_ATTRIB_COL1][2];
# else
span.specRedStep = SignedFloatToFixed(span.attrStepX[FRAG_ATTRIB_COL1][0]);
span.specGreenStep = SignedFloatToFixed(span.attrStepX[FRAG_ATTRIB_COL1][1]);
diff-tree 8d2d6e5194fb49619ed5125d95f8619bdf3b8106 (from e9c614a1af05057d35692e27d569c6f78b718638)
Author: Brian <brian at yutani.localnet.net>
Date: Sat Apr 7 08:43:40 2007 -0600
fix comment typo
diff --git a/src/mesa/swrast/s_span.c b/src/mesa/swrast/s_span.c
index dab3d54..b0c04ad 100644
--- a/src/mesa/swrast/s_span.c
+++ b/src/mesa/swrast/s_span.c
@@ -134,7 +134,7 @@ _swrast_span_default_secondary_color(GLc
span->specRed = r;
span->specGreen = g;
span->specBlue = b;
- /8span->specAlpha = a;*/
+ /*span->specAlpha = a;*/
#else
span->specRed = IntToFixed(r);
span->specGreen = IntToFixed(g);
diff-tree e9c614a1af05057d35692e27d569c6f78b718638 (from 8f3fc5221cbbc93f66d35a526e8385edf56adce5)
Author: Richard Hughes <hughsient at gmail.com>
Date: Sat Apr 7 08:39:24 2007 -0600
remove array_cache/, add vbo/
diff --git a/Makefile b/Makefile
index c99ed53..d6a3486 100644
--- a/Makefile
+++ b/Makefile
@@ -209,9 +209,6 @@ MAIN_FILES = \
$(DIRECTORY)/src/mesa/glapi/*.[chS] \
$(DIRECTORY)/src/mesa/glapi/descrip.mms \
$(DIRECTORY)/src/mesa/glapi/sources \
- $(DIRECTORY)/src/mesa/array_cache/*.[ch] \
- $(DIRECTORY)/src/mesa/array_cache/descrip.mms \
- $(DIRECTORY)/src/mesa/array_cache/sources \
$(DIRECTORY)/src/mesa/math/*.[ch] \
$(DIRECTORY)/src/mesa/math/descrip.mms \
$(DIRECTORY)/src/mesa/math/sources \
@@ -231,6 +228,8 @@ MAIN_FILES = \
$(DIRECTORY)/src/mesa/swrast_setup/*.[ch] \
$(DIRECTORY)/src/mesa/swrast_setup/descrip.mms \
$(DIRECTORY)/src/mesa/swrast_setup/sources \
+ $(DIRECTORY)/src/mesa/vbo/*.[chS] \
+ $(DIRECTORY)/src/mesa/vbo/descrip.mms \
$(DIRECTORY)/src/mesa/tnl/*.[chS] \
$(DIRECTORY)/src/mesa/tnl/descrip.mms \
$(DIRECTORY)/src/mesa/tnl/sources \
diff-tree 8f3fc5221cbbc93f66d35a526e8385edf56adce5 (from ae55d5322c9cff61f61e8df04bb0846332cc85ce)
Author: Brian <brian at yutani.localnet.net>
Date: Sat Apr 7 08:38:36 2007 -0600
added glActiveStencilFaceEXT
diff --git a/progs/util/extfuncs.h b/progs/util/extfuncs.h
index f5ea5fe..13067cd 100644
--- a/progs/util/extfuncs.h
+++ b/progs/util/extfuncs.h
@@ -56,6 +56,8 @@ static PFNGLDELETEVERTEXARRAYSAPPLEPROC
static PFNGLGENVERTEXARRAYSAPPLEPROC glGenVertexArraysAPPLE_func = NULL;
static PFNGLISVERTEXARRAYAPPLEPROC glIsVertexArrayAPPLE_func = NULL;
+/* GL_EXT_stencil_two_side */
+static PFNGLACTIVESTENCILFACEEXTPROC glActiveStencilFaceEXT_func = NULL;
static void
@@ -114,5 +116,7 @@ GetExtensionFuncs(void)
glGenVertexArraysAPPLE_func = (PFNGLGENVERTEXARRAYSAPPLEPROC) glutGetProcAddress("glGenVertexArraysAPPLE");
glIsVertexArrayAPPLE_func = (PFNGLISVERTEXARRAYAPPLEPROC) glutGetProcAddress("glIsVertexArrayAPPLE");
+ /* GL_EXT_stencil_two_side */
+ glActiveStencilFaceEXT_func = (PFNGLACTIVESTENCILFACEEXTPROC) glutGetProcAddress("glActiveStencilFaceEXT");
}
diff-tree ae55d5322c9cff61f61e8df04bb0846332cc85ce (from 92b7fa7b48691e95d33bc0580cfad858782622ac)
Author: Brian <brian at yutani.localnet.net>
Date: Fri Apr 6 15:45:11 2007 -0600
for evaluators, loop to VBO_ATTRIB_TEX7, not VBO_ATTRIB_INDEX. See bug 10543
diff --git a/src/mesa/vbo/vbo_exec_api.c b/src/mesa/vbo/vbo_exec_api.c
index c30fd18..8d13ef9 100644
--- a/src/mesa/vbo/vbo_exec_api.c
+++ b/src/mesa/vbo/vbo_exec_api.c
@@ -390,7 +390,7 @@ static void GLAPIENTRY vbo_exec_EvalCoor
if (exec->eval.recalculate_maps)
vbo_exec_eval_update( exec );
- for (i = 0 ; i <= VBO_ATTRIB_INDEX ; i++) {
+ for (i = 0; i <= VBO_ATTRIB_TEX7; i++) {
if (exec->eval.map1[i].map)
if (exec->vtx.active_sz[i] != exec->eval.map1[i].sz)
vbo_exec_fixup_vertex( ctx, i, exec->eval.map1[i].sz );
@@ -417,7 +417,7 @@ static void GLAPIENTRY vbo_exec_EvalCoor
if (exec->eval.recalculate_maps)
vbo_exec_eval_update( exec );
- for (i = 0 ; i <= VBO_ATTRIB_INDEX ; i++) {
+ for (i = 0; i <= VBO_ATTRIB_TEX7; i++) {
if (exec->eval.map2[i].map)
if (exec->vtx.active_sz[i] != exec->eval.map2[i].sz)
vbo_exec_fixup_vertex( ctx, i, exec->eval.map2[i].sz );
diff --git a/src/mesa/vbo/vbo_exec_eval.c b/src/mesa/vbo/vbo_exec_eval.c
index 99a8044..fe53329 100644
--- a/src/mesa/vbo/vbo_exec_eval.c
+++ b/src/mesa/vbo/vbo_exec_eval.c
@@ -135,7 +135,7 @@ void vbo_exec_do_EvalCoord1f(struct vbo_
{
GLuint attr;
- for (attr = 1; attr <= VBO_ATTRIB_INDEX; attr++) {
+ for (attr = 1; attr <= VBO_ATTRIB_TEX7; attr++) {
struct gl_1d_map *map = exec->eval.map1[attr].map;
if (map) {
GLfloat uu = (u - map->u1) * map->du;
@@ -180,7 +180,7 @@ void vbo_exec_do_EvalCoord2f( struct vbo
{
GLuint attr;
- for (attr = 1; attr <= VBO_ATTRIB_INDEX; attr++) {
+ for (attr = 1; attr <= VBO_ATTRIB_TEX7; attr++) {
struct gl_2d_map *map = exec->eval.map2[attr].map;
if (map) {
GLfloat uu = (u - map->u1) * map->du;
More information about the mesa-commit
mailing list