OpenHarmony/third_party_mesa3d
2
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

swrast: s/GLbitfield/GLbitfield64/ for sw_span::arrayAttribs

Browse Source 
This is a bitfield of FRAG_BIT_x values so it should be 64-bits now.
This commit is contained in:
Brian Paul
2012-01-07 14:16:27 -07:00
parent 7d960a352f
commit 8dffb6bdab
4 changed files with 8 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/mesa/swrast/s_context.c
View File

@@ -492,7 +492,7 @@ static void
_swrast_update_active_attribs(struct gl_context *ctx) _swrast_update_active_attribs(struct gl_context *ctx)
{ {
SWcontext *swrast = SWRAST_CONTEXT(ctx); SWcontext *swrast = SWRAST_CONTEXT(ctx);
GLuint attribsMask; GLbitfield64 attribsMask;
/* /*
* Compute _ActiveAttribsMask = which fragment attributes are needed. * Compute _ActiveAttribsMask = which fragment attributes are needed.

4
src/mesa/swrast/s_context.h
View File

@@ -196,8 +196,8 @@ typedef struct
/** List/array of the fragment attributes to interpolate */ /** List/array of the fragment attributes to interpolate */
GLuint _ActiveAttribs[FRAG_ATTRIB_MAX]; GLuint _ActiveAttribs[FRAG_ATTRIB_MAX];
/** Same info, but as a bitmask */ /** Same info, but as a bitmask of FRAG_BIT_x bits */
GLbitfield _ActiveAttribMask; GLbitfield64 _ActiveAttribMask;
/** Number of fragment attributes to interpolate */ /** Number of fragment attributes to interpolate */
GLuint _NumActiveAttribs; GLuint _NumActiveAttribs;
/** Indicates how each attrib is to be interpolated (lines/tris) */ /** Indicates how each attrib is to be interpolated (lines/tris) */

5
src/mesa/swrast/s_span.c
View File

@@ -163,7 +163,8 @@ _swrast_span_default_attribs(struct gl_context *ctx, SWspan *span)
* should have computed attrStart/Step values for FRAG_ATTRIB_WPOS[3]! * should have computed attrStart/Step values for FRAG_ATTRIB_WPOS[3]!
*/ */
static inline void static inline void
interpolate_active_attribs(struct gl_context *ctx, SWspan *span, GLbitfield attrMask) interpolate_active_attribs(struct gl_context *ctx, SWspan *span,
GLbitfield64 attrMask)
{ {
const SWcontext *swrast = SWRAST_CONTEXT(ctx); const SWcontext *swrast = SWRAST_CONTEXT(ctx);
@@ -1038,7 +1039,7 @@ _swrast_write_rgba_span( struct gl_context *ctx, SWspan *span)
const GLuint *colorMask = (GLuint *) ctx->Color.ColorMask; const GLuint *colorMask = (GLuint *) ctx->Color.ColorMask;
const GLbitfield origInterpMask = span->interpMask; const GLbitfield origInterpMask = span->interpMask;
const GLbitfield origArrayMask = span->arrayMask; const GLbitfield origArrayMask = span->arrayMask;
const GLbitfield origArrayAttribs = span->arrayAttribs; const GLbitfield64 origArrayAttribs = span->arrayAttribs;
const GLenum origChanType = span->array->ChanType; const GLenum origChanType = span->array->ChanType;
void * const origRgba = span->array->rgba; void * const origRgba = span->array->rgba;
const GLboolean shader = (ctx->FragmentProgram._Current const GLboolean shader = (ctx->FragmentProgram._Current

3
src/mesa/swrast/s_span.h
View File

@@ -155,7 +155,8 @@ typedef struct sw_span
*/ */
GLbitfield arrayMask; GLbitfield arrayMask;
GLbitfield arrayAttribs; /** Mask of FRAG_BIT_x bits */
GLbitfield64 arrayAttribs;
/** /**
* We store the arrays of fragment values in a separate struct so * We store the arrays of fragment values in a separate struct so