Looks good. Please apply to the 7.8 branch.
-Brian
On Tue, Mar 30, 2010 at 11:44 PM, <skeg...@gmail.com> wrote:
> From: Ben Skeggs <bske...@redhat.com>
>
> ---
> src/mesa/state_tracker/st_atom_rasterizer.c | 2 +-
> src/mesa/state_tracker/st_program.c | 6 +++---
> 2 files changed, 4 insertions(+), 4 deletions(-)
>
> diff --git a/src/mesa/state_tracker/st_atom_rasterizer.c
> b/src/mesa/state_tracker/st_atom_rasterizer.c
> index 9c9a99b..5669b1f 100644
> --- a/src/mesa/state_tracker/st_atom_rasterizer.c
> +++ b/src/mesa/state_tracker/st_atom_rasterizer.c
> @@ -209,7 +209,7 @@ static void update_raster_state( struct st_context *st )
> */
> if (vertProg) {
> 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 */
> raster->point_size_per_vertex = TRUE;
> }
> diff --git a/src/mesa/state_tracker/st_program.c
> b/src/mesa/state_tracker/st_program.c
> index 7f8677d..6e8c446 100644
> --- a/src/mesa/state_tracker/st_program.c
> +++ b/src/mesa/state_tracker/st_program.c
> @@ -121,7 +121,7 @@ st_prepare_vertex_program(struct st_context *st,
> /* Compute mapping of vertex program outputs to slots.
> */
> 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;
> }
> else {
> @@ -388,7 +388,7 @@ st_translate_fragment_program(struct st_context *st,
> GLbitfield64 outputsWritten = stfp->Base.Base.OutputsWritten;
>
> /* 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_index[fs_num_outputs] = 0;
> outputMapping[FRAG_RESULT_DEPTH] = fs_num_outputs;
> @@ -398,7 +398,7 @@ st_translate_fragment_program(struct st_context *st,
>
> /* handle remaning outputs (color) */
> for (attr = 0; attr < FRAG_RESULT_MAX; attr++) {
> - if (outputsWritten & (1 << attr)) {
> + if (outputsWritten & BITFIELD64_BIT(attr)) {
> switch (attr) {
> case FRAG_RESULT_DEPTH:
> /* handled above */
> --
> 1.7.0.1
>
>
> ------------------------------------------------------------------------------
> Download Intel® Parallel Studio Eval
> Try the new software tools for yourself. Speed compiling, find bugs
> proactively, and fine-tune applications for parallel performance.
> See why Intel Parallel Studio got high marks during beta.
> http://p.sf.net/sfu/intel-sw-dev
> _______________________________________________
> Mesa3d-dev mailing list
> Mesa3d-dev@lists.sourceforge.net
> https://lists.sourceforge.net/lists/listinfo/mesa3d-dev
>
------------------------------------------------------------------------------
Download Intel® Parallel Studio Eval
Try the new software tools for yourself. Speed compiling, find bugs
proactively, and fine-tune applications for parallel performance.
See why Intel Parallel Studio got high marks during beta.
http://p.sf.net/sfu/intel-sw-dev
_______________________________________________
Mesa3d-dev mailing list
Mesa3d-dev@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/mesa3d-dev
