I've been playing with mesa for the last hour or so, and have finally
managed to get it to build on fedora core rawhide. Possible newbie
mistakes are very possible, as I've only been working on DRI and DRM for
a few days - so apologies if my patches are incorrect or just plain
wrong.
Five patches are attached:
1. mesa-buildfix.patch just adds and removes some directories so we can
build tarballs.
2. mesa-fix-compile-float.patch just re-adds the sz4 enum for the float.
3. mesa-fix-compile-comment.patch fixes a trivial typo.
4. mesa-fix-compile-attr.patch that fixes the float handling for
attrStepX.
5. mesa-fix-post-increment.patch that simply post increments the version
so that git packages don't get built with a 6.5.2 suffix.
Please review, thanks!
Richard Hughes
p.s. nouveau_dri.so loads okay and DRI is detected with glxinfo, but
glxgears locks the machine dead. Expect more patches :-)
diff --git a/Makefile b/Makefile
index c99ed53..f4ed2b0 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 --git a/src/mesa/swrast/s_span.h b/src/mesa/swrast/s_span.h
index f650a27..bd0a582 100644
--- a/src/mesa/swrast/s_span.h
+++ b/src/mesa/swrast/s_span.h
@@ -101,6 +101,10 @@ typedef struct sw_span_arrays
GLushort rgba[MAX_WIDTH][4];
GLushort spec[MAX_WIDTH][4];
} sz2;
+ struct {
+ GLfloat rgba[MAX_WIDTH][4];
+ GLfloat spec[MAX_WIDTH][4];
+ } sz4;
} color;
/** XXX these are temporary fields, pointing into above color arrays */
GLchan (*rgba)[4];
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(GLcontext *ctx, SWspan *span)
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 --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 SWvertex *v0,
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 --git a/Makefile b/Makefile
index c99ed53..f4ed2b0 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 \
-------------------------------------------------------------------------
Take Surveys. Earn Cash. Influence the Future of IT
Join SourceForge.net's Techsay panel and you'll get the chance to share your
opinions on IT & business topics through brief surveys-and earn cash
http://www.techsay.com/default.php?page=join.php&p=sourceforge&CID=DEVDEV
_______________________________________________
Mesa3d-dev mailing list
[email protected]
https://lists.sourceforge.net/lists/listinfo/mesa3d-dev
