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

st/mesa: use BITFIELD64_BIT to access shader OutputsWritten in more places

Browse Source
This commit is contained in:
Ben Skeggs
2010-03-31 15:44:25 +10:00
parent 325d55303d
commit b46750d601
2 changed files with 4 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/mesa/state_tracker/st_atom_rasterizer.c
View File

@@ -209,7 +209,7 @@ static void update_raster_state( struct st_context *st )
*/ */
if (vertProg) { if (vertProg) {
if (vertProg->Base.Id == 0) { if (vertProg->Base.Id == 0) {
if (vertProg->Base.OutputsWritten & (1 << VERT_RESULT_PSIZ)) { if (vertProg->Base.OutputsWritten & BITFIELD64_BIT(VERT_RESULT_PSIZ)) {
/* generated program which emits point size */ /* generated program which emits point size */
raster->point_size_per_vertex = TRUE; raster->point_size_per_vertex = TRUE;
} }

6
src/mesa/state_tracker/st_program.c
View File

@@ -121,7 +121,7 @@ st_prepare_vertex_program(struct st_context *st,
/* Compute mapping of vertex program outputs to slots. /* Compute mapping of vertex program outputs to slots.
*/ */
for (attr = 0; attr < VERT_RESULT_MAX; attr++) { for (attr = 0; attr < VERT_RESULT_MAX; attr++) {
if ((stvp->Base.Base.OutputsWritten & (1 << attr)) == 0) { if ((stvp->Base.Base.OutputsWritten & BITFIELD64_BIT(attr)) == 0) {
stvp->result_to_output[attr] = ~0; stvp->result_to_output[attr] = ~0;
} }
else { else {
@@ -388,7 +388,7 @@ st_translate_fragment_program(struct st_context *st,
GLbitfield64 outputsWritten = stfp->Base.Base.OutputsWritten; GLbitfield64 outputsWritten = stfp->Base.Base.OutputsWritten;
/* if z is written, emit that first */ /* if z is written, emit that first */
if (outputsWritten & (1 << FRAG_RESULT_DEPTH)) { if (outputsWritten & BITFIELD64_BIT(FRAG_RESULT_DEPTH)) {
fs_output_semantic_name[fs_num_outputs] = TGSI_SEMANTIC_POSITION; fs_output_semantic_name[fs_num_outputs] = TGSI_SEMANTIC_POSITION;
fs_output_semantic_index[fs_num_outputs] = 0; fs_output_semantic_index[fs_num_outputs] = 0;
outputMapping[FRAG_RESULT_DEPTH] = fs_num_outputs; outputMapping[FRAG_RESULT_DEPTH] = fs_num_outputs;
@@ -398,7 +398,7 @@ st_translate_fragment_program(struct st_context *st,
/* handle remaning outputs (color) */ /* handle remaning outputs (color) */
for (attr = 0; attr < FRAG_RESULT_MAX; attr++) { for (attr = 0; attr < FRAG_RESULT_MAX; attr++) {
if (outputsWritten & (1 << attr)) { if (outputsWritten & BITFIELD64_BIT(attr)) {
switch (attr) { switch (attr) {
case FRAG_RESULT_DEPTH: case FRAG_RESULT_DEPTH:
/* handled above */ /* handled above */