projects
/
mesa.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Drop GLcontext typedef and use struct gl_context instead
[mesa.git]
/
src
/
mesa
/
drivers
/
dri
/
unichrome
/
via_tris.c
diff --git
a/src/mesa/drivers/dri/unichrome/via_tris.c
b/src/mesa/drivers/dri/unichrome/via_tris.c
index 79e67620c9edc784558fc5e11607a4d0d6a3edde..51f6af9228a02ee1de7bc11892b5cadc8886f479 100644
(file)
--- a/
src/mesa/drivers/dri/unichrome/via_tris.c
+++ b/
src/mesa/drivers/dri/unichrome/via_tris.c
@@
-257,7
+257,6
@@
static struct {
#define DO_POINTS 1
#define DO_FULL_QUAD 1
#define DO_POINTS 1
#define DO_FULL_QUAD 1
-#define HAVE_RGBA 1
#define HAVE_SPEC 1
#define HAVE_BACK_COLORS 0
#define HAVE_HW_FLATSHADE 1
#define HAVE_SPEC 1
#define HAVE_BACK_COLORS 0
#define HAVE_HW_FLATSHADE 1
@@
-330,7
+329,8
@@
do { \
#define LOCAL_VARS(n) \
struct via_context *vmesa = VIA_CONTEXT(ctx); \
#define LOCAL_VARS(n) \
struct via_context *vmesa = VIA_CONTEXT(ctx); \
- GLuint color[n], spec[n]; \
+ GLuint color[n] = { 0 }; \
+ GLuint spec[n] = { 0 }; \
GLuint coloroffset = vmesa->coloroffset; \
GLuint specoffset = vmesa->specoffset; \
(void)color; (void)spec; (void)coloroffset; (void)specoffset;
GLuint coloroffset = vmesa->coloroffset; \
GLuint specoffset = vmesa->specoffset; \
(void)color; (void)spec; (void)coloroffset; (void)specoffset;
@@
-490,7
+490,7
@@
via_fallback_tri(struct via_context *vmesa,
viaVertex *v1,
viaVertex *v2)
{
viaVertex *v1,
viaVertex *v2)
{
-
GL
context *ctx = vmesa->glCtx;
+
struct gl_
context *ctx = vmesa->glCtx;
SWvertex v[3];
_swsetup_Translate(ctx, v0, &v[0]);
_swsetup_Translate(ctx, v1, &v[1]);
SWvertex v[3];
_swsetup_Translate(ctx, v0, &v[0]);
_swsetup_Translate(ctx, v1, &v[1]);
@@
-506,7
+506,7
@@
via_fallback_line(struct via_context *vmesa,
viaVertex *v0,
viaVertex *v1)
{
viaVertex *v0,
viaVertex *v1)
{
-
GL
context *ctx = vmesa->glCtx;
+
struct gl_
context *ctx = vmesa->glCtx;
SWvertex v[2];
_swsetup_Translate(ctx, v0, &v[0]);
_swsetup_Translate(ctx, v1, &v[1]);
SWvertex v[2];
_swsetup_Translate(ctx, v0, &v[0]);
_swsetup_Translate(ctx, v1, &v[1]);
@@
-520,7
+520,7
@@
static void
via_fallback_point(struct via_context *vmesa,
viaVertex *v0)
{
via_fallback_point(struct via_context *vmesa,
viaVertex *v0)
{
-
GL
context *ctx = vmesa->glCtx;
+
struct gl_
context *ctx = vmesa->glCtx;
SWvertex v[1];
_swsetup_Translate(ctx, v0, &v[0]);
viaSpanRenderStart( ctx );
SWvertex v[1];
_swsetup_Translate(ctx, v0, &v[0]);
viaSpanRenderStart( ctx );
@@
-528,7
+528,7
@@
via_fallback_point(struct via_context *vmesa,
viaSpanRenderFinish( ctx );
}
viaSpanRenderFinish( ctx );
}
-static void viaResetLineStipple(
GL
context *ctx )
+static void viaResetLineStipple(
struct gl_
context *ctx )
{
struct via_context *vmesa = VIA_CONTEXT(ctx);
vmesa->regCmdB |= HC_HLPrst_MASK;
{
struct via_context *vmesa = VIA_CONTEXT(ctx);
vmesa->regCmdB |= HC_HLPrst_MASK;
@@
-578,7
+578,7
@@
static void viaResetLineStipple( GLcontext *ctx )
-static void viaRenderClippedPoly(
GL
context *ctx, const GLuint *elts,
+static void viaRenderClippedPoly(
struct gl_
context *ctx, const GLuint *elts,
GLuint n)
{
TNLcontext *tnl = TNL_CONTEXT(ctx);
GLuint n)
{
TNLcontext *tnl = TNL_CONTEXT(ctx);
@@
-602,13
+602,13
@@
static void viaRenderClippedPoly(GLcontext *ctx, const GLuint *elts,
tnl->Driver.Render.PrimitiveNotify( ctx, prim );
}
tnl->Driver.Render.PrimitiveNotify( ctx, prim );
}
-static void viaRenderClippedLine(
GL
context *ctx, GLuint ii, GLuint jj)
+static void viaRenderClippedLine(
struct gl_
context *ctx, GLuint ii, GLuint jj)
{
TNLcontext *tnl = TNL_CONTEXT(ctx);
tnl->Driver.Render.Line(ctx, ii, jj);
}
{
TNLcontext *tnl = TNL_CONTEXT(ctx);
tnl->Driver.Render.Line(ctx, ii, jj);
}
-static void viaFastRenderClippedPoly(
GL
context *ctx, const GLuint *elts,
+static void viaFastRenderClippedPoly(
struct gl_
context *ctx, const GLuint *elts,
GLuint n)
{
struct via_context *vmesa = VIA_CONTEXT(ctx);
GLuint n)
{
struct via_context *vmesa = VIA_CONTEXT(ctx);
@@
-645,7
+645,7
@@
static void viaFastRenderClippedPoly(GLcontext *ctx, const GLuint *elts,
_NEW_POLYGONSTIPPLE)
_NEW_POLYGONSTIPPLE)
-static void viaChooseRenderState(
GL
context *ctx)
+static void viaChooseRenderState(
struct gl_
context *ctx)
{
TNLcontext *tnl = TNL_CONTEXT(ctx);
struct via_context *vmesa = VIA_CONTEXT(ctx);
{
TNLcontext *tnl = TNL_CONTEXT(ctx);
struct via_context *vmesa = VIA_CONTEXT(ctx);
@@
-739,7
+739,7
@@
do { \
-static void viaChooseVertexState(
GL
context *ctx )
+static void viaChooseVertexState(
struct gl_
context *ctx )
{
struct via_context *vmesa = VIA_CONTEXT(ctx);
TNLcontext *tnl = TNL_CONTEXT(ctx);
{
struct via_context *vmesa = VIA_CONTEXT(ctx);
TNLcontext *tnl = TNL_CONTEXT(ctx);
@@
-822,7
+822,7
@@
static void viaChooseVertexState( GLcontext *ctx )
* them. Fallback to swrast if we can't. Returns GL_TRUE if projective
* texture coordinates must be faked, GL_FALSE otherwise.
*/
* them. Fallback to swrast if we can't. Returns GL_TRUE if projective
* texture coordinates must be faked, GL_FALSE otherwise.
*/
-static GLboolean viaCheckPTexHack(
GL
context *ctx )
+static GLboolean viaCheckPTexHack(
struct gl_
context *ctx )
{
TNLcontext *tnl = TNL_CONTEXT(ctx);
struct vertex_buffer *VB = &tnl->vb;
{
TNLcontext *tnl = TNL_CONTEXT(ctx);
struct vertex_buffer *VB = &tnl->vb;
@@
-832,13
+832,13
@@
static GLboolean viaCheckPTexHack( GLcontext *ctx )
RENDERINPUTS_COPY( index_bitset, tnl->render_inputs_bitset );
RENDERINPUTS_COPY( index_bitset, tnl->render_inputs_bitset );
- if (RENDERINPUTS_TEST( index_bitset, _TNL_ATTRIB_TEX0 ) && VB->
TexCoordPtr[
0]->size == 4) {
+ if (RENDERINPUTS_TEST( index_bitset, _TNL_ATTRIB_TEX0 ) && VB->
AttribPtr[_TNL_ATTRIB_TEX
0]->size == 4) {
if (!RENDERINPUTS_TEST_RANGE( index_bitset, _TNL_ATTRIB_TEX1, _TNL_LAST_TEX ))
ptexHack = GL_TRUE;
else
fallback = GL_TRUE;
}
if (!RENDERINPUTS_TEST_RANGE( index_bitset, _TNL_ATTRIB_TEX1, _TNL_LAST_TEX ))
ptexHack = GL_TRUE;
else
fallback = GL_TRUE;
}
- if (RENDERINPUTS_TEST( index_bitset, _TNL_ATTRIB_TEX1 ) && VB->
TexCoordPtr[
1]->size == 4)
+ if (RENDERINPUTS_TEST( index_bitset, _TNL_ATTRIB_TEX1 ) && VB->
AttribPtr[_TNL_ATTRIB_TEX
1]->size == 4)
fallback = GL_TRUE;
FALLBACK(VIA_CONTEXT(ctx), VIA_FALLBACK_PROJ_TEXTURE, fallback);
fallback = GL_TRUE;
FALLBACK(VIA_CONTEXT(ctx), VIA_FALLBACK_PROJ_TEXTURE, fallback);
@@
-853,7
+853,7
@@
static GLboolean viaCheckPTexHack( GLcontext *ctx )
/**********************************************************************/
/**********************************************************************/
-static void viaRenderStart(
GL
context *ctx)
+static void viaRenderStart(
struct gl_
context *ctx)
{
struct via_context *vmesa = VIA_CONTEXT(ctx);
TNLcontext *tnl = TNL_CONTEXT(ctx);
{
struct via_context *vmesa = VIA_CONTEXT(ctx);
TNLcontext *tnl = TNL_CONTEXT(ctx);
@@
-888,7
+888,7
@@
static void viaRenderStart(GLcontext *ctx)
VB->AttribPtr[VERT_ATTRIB_POS] = VB->NdcPtr;
}
VB->AttribPtr[VERT_ATTRIB_POS] = VB->NdcPtr;
}
-static void viaRenderFinish(
GL
context *ctx)
+static void viaRenderFinish(
struct gl_
context *ctx)
{
VIA_FINISH_PRIM(VIA_CONTEXT(ctx));
}
{
VIA_FINISH_PRIM(VIA_CONTEXT(ctx));
}
@@
-897,7
+897,7
@@
static void viaRenderFinish(GLcontext *ctx)
/* System to flush dma and emit state changes based on the rasterized
* primitive.
*/
/* System to flush dma and emit state changes based on the rasterized
* primitive.
*/
-void viaRasterPrimitive(
GL
context *ctx,
+void viaRasterPrimitive(
struct gl_
context *ctx,
GLenum glprim,
GLenum hwprim)
{
GLenum glprim,
GLenum hwprim)
{
@@
-1035,7
+1035,7
@@
void viaRasterPrimitive(GLcontext *ctx,
/* Callback for mesa:
*/
/* Callback for mesa:
*/
-static void viaRenderPrimitive(
GL
context *ctx, GLuint prim )
+static void viaRenderPrimitive(
struct gl_
context *ctx, GLuint prim )
{
viaRasterPrimitive( ctx, prim, hwPrim[prim] );
}
{
viaRasterPrimitive( ctx, prim, hwPrim[prim] );
}
@@
-1103,7
+1103,7
@@
void viaFinishPrimitive(struct via_context *vmesa)
void viaFallback(struct via_context *vmesa, GLuint bit, GLboolean mode)
{
void viaFallback(struct via_context *vmesa, GLuint bit, GLboolean mode)
{
-
GL
context *ctx = vmesa->glCtx;
+
struct gl_
context *ctx = vmesa->glCtx;
TNLcontext *tnl = TNL_CONTEXT(ctx);
GLuint oldfallback = vmesa->Fallback;
TNLcontext *tnl = TNL_CONTEXT(ctx);
GLuint oldfallback = vmesa->Fallback;
@@
-1148,7
+1148,7
@@
void viaFallback(struct via_context *vmesa, GLuint bit, GLboolean mode)
}
}
}
}
-static void viaRunPipeline(
GL
context *ctx )
+static void viaRunPipeline(
struct gl_
context *ctx )
{
struct via_context *vmesa = VIA_CONTEXT(ctx);
{
struct via_context *vmesa = VIA_CONTEXT(ctx);
@@
-1166,7
+1166,7
@@
static void viaRunPipeline( GLcontext *ctx )
/**********************************************************************/
/**********************************************************************/
-void viaInitTriFuncs(
GL
context *ctx)
+void viaInitTriFuncs(
struct gl_
context *ctx)
{
struct via_context *vmesa = VIA_CONTEXT(ctx);
TNLcontext *tnl = TNL_CONTEXT(ctx);
{
struct via_context *vmesa = VIA_CONTEXT(ctx);
TNLcontext *tnl = TNL_CONTEXT(ctx);