diff options
| author | marha <marha@users.sourceforge.net> | 2011-03-17 14:17:54 +0000 |
|---|---|---|
| committer | marha <marha@users.sourceforge.net> | 2011-03-17 14:17:54 +0000 |
| commit | 76b655664dad149451d0abaa15929d1b7b62e0c6 (patch) | |
| tree | e7c3389fec52eaad405e2025e04555766493022c /mesalib/src/mesa/state_tracker | |
| parent | a44b2f0d059871926ffb84dabdae53ddaa390beb (diff) | |
| parent | d7f1bd4112420f1d4b41c5409074eca6b34bf507 (diff) | |
| download | vcxsrv-76b655664dad149451d0abaa15929d1b7b62e0c6.tar.gz vcxsrv-76b655664dad149451d0abaa15929d1b7b62e0c6.tar.bz2 vcxsrv-76b655664dad149451d0abaa15929d1b7b62e0c6.zip | |
svn merge ^/branches/released .
Diffstat (limited to 'mesalib/src/mesa/state_tracker')
| -rw-r--r-- | mesalib/src/mesa/state_tracker/st_atom_pixeltransfer.c | 2 | ||||
| -rw-r--r-- | mesalib/src/mesa/state_tracker/st_cb_drawpixels.c | 4 | ||||
| -rw-r--r-- | mesalib/src/mesa/state_tracker/st_program.c | 2 |
3 files changed, 4 insertions, 4 deletions
diff --git a/mesalib/src/mesa/state_tracker/st_atom_pixeltransfer.c b/mesalib/src/mesa/state_tracker/st_atom_pixeltransfer.c index 98be6ab75..e0a1cba2b 100644 --- a/mesalib/src/mesa/state_tracker/st_atom_pixeltransfer.c +++ b/mesalib/src/mesa/state_tracker/st_atom_pixeltransfer.c @@ -187,7 +187,7 @@ get_pixel_transfer_program(struct gl_context *ctx, const struct state_key *key) inst[ic].TexSrcTarget = TEXTURE_2D_INDEX;
ic++;
fp->Base.InputsRead = (1 << FRAG_ATTRIB_TEX0);
- fp->Base.OutputsWritten = (1 << FRAG_RESULT_COLOR);
+ fp->Base.OutputsWritten = BITFIELD64_BIT(FRAG_RESULT_COLOR);
fp->Base.SamplersUsed = 0x1; /* sampler 0 (bit 0) is used */
if (key->scaleAndBias) {
diff --git a/mesalib/src/mesa/state_tracker/st_cb_drawpixels.c b/mesalib/src/mesa/state_tracker/st_cb_drawpixels.c index 5c95eddd0..2909d9d95 100644 --- a/mesalib/src/mesa/state_tracker/st_cb_drawpixels.c +++ b/mesalib/src/mesa/state_tracker/st_cb_drawpixels.c @@ -213,9 +213,9 @@ st_make_drawpix_z_stencil_program(struct st_context *st, p->InputsRead = FRAG_BIT_TEX0 | FRAG_BIT_COL0;
p->OutputsWritten = 0;
if (write_depth)
- p->OutputsWritten |= (1 << FRAG_RESULT_DEPTH);
+ p->OutputsWritten |= BITFIELD64_BIT(FRAG_RESULT_DEPTH);
if (write_stencil)
- p->OutputsWritten |= (1 << FRAG_RESULT_STENCIL);
+ p->OutputsWritten |= BITFIELD64_BIT(FRAG_RESULT_STENCIL);
p->SamplersUsed = 0x1; /* sampler 0 (bit 0) is used */
if (write_stencil)
diff --git a/mesalib/src/mesa/state_tracker/st_program.c b/mesalib/src/mesa/state_tracker/st_program.c index e5c26c563..1efc58799 100644 --- a/mesalib/src/mesa/state_tracker/st_program.c +++ b/mesalib/src/mesa/state_tracker/st_program.c @@ -798,7 +798,7 @@ st_translate_geometry_program(struct st_context *st, * mapping and the semantic information for each output.
*/
for (attr = 0; attr < GEOM_RESULT_MAX; attr++) {
- if (stgp->Base.Base.OutputsWritten & (1 << attr)) {
+ if (stgp->Base.Base.OutputsWritten & BITFIELD64_BIT(attr)) {
GLuint slot;
slot = gs_num_outputs;
|