Преглед изворни кода

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

This is a bitfield of FRAG_BIT_x values so it should be 64-bits now.
tags/mesa-8.0-rc1
Brian Paul пре 13 година
родитељ
комит
8dffb6bdab
4 измењених фајлова са 8 додато и 6 уклоњено
  1. 1
    1
      src/mesa/swrast/s_context.c
  2. 2
    2
      src/mesa/swrast/s_context.h
  3. 3
    2
      src/mesa/swrast/s_span.c
  4. 2
    1
      src/mesa/swrast/s_span.h

+ 1
- 1
src/mesa/swrast/s_context.c Прегледај датотеку

@@ -492,7 +492,7 @@ static void
_swrast_update_active_attribs(struct gl_context *ctx)
{
SWcontext *swrast = SWRAST_CONTEXT(ctx);
GLuint attribsMask;
GLbitfield64 attribsMask;

/*
* Compute _ActiveAttribsMask = which fragment attributes are needed.

+ 2
- 2
src/mesa/swrast/s_context.h Прегледај датотеку

@@ -196,8 +196,8 @@ typedef struct

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

+ 3
- 2
src/mesa/swrast/s_span.c Прегледај датотеку

@@ -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]!
*/
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);

@@ -1038,7 +1039,7 @@ _swrast_write_rgba_span( struct gl_context *ctx, SWspan *span)
const GLuint *colorMask = (GLuint *) ctx->Color.ColorMask;
const GLbitfield origInterpMask = span->interpMask;
const GLbitfield origArrayMask = span->arrayMask;
const GLbitfield origArrayAttribs = span->arrayAttribs;
const GLbitfield64 origArrayAttribs = span->arrayAttribs;
const GLenum origChanType = span->array->ChanType;
void * const origRgba = span->array->rgba;
const GLboolean shader = (ctx->FragmentProgram._Current

+ 2
- 1
src/mesa/swrast/s_span.h Прегледај датотеку

@@ -155,7 +155,8 @@ typedef struct sw_span
*/
GLbitfield arrayMask;

GLbitfield arrayAttribs;
/** Mask of FRAG_BIT_x bits */
GLbitfield64 arrayAttribs;

/**
* We store the arrays of fragment values in a separate struct so

Loading…
Откажи
Сачувај