fdo-mirrors/mesa
1
0
Fork 0
mirror of https://gitlab.freedesktop.org/mesa/mesa.git synced 2026-05-08 09:08:10 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions 1

mesa: Pass number of samples as a program state variable

Browse source 
Number of samples will be required in fragment shader program by new
GLSL builtin uniform "gl_NumSamples".

V2: Use "state.numsamples" in place of "state.num.samples"
    Use _NEW_BUFFERS flag in place of _NEW_MULTISAMPLE

Signed-off-by: Anuj Phogat <anuj.phogat@gmail.com>
Reviewed-by: Ian Romanick <idr@freedesktop.org>
Reviewed-by: Ken Graunke <kenneth@whitecape.org>
Reviewed-by: Paul Berry <stereotype441@gmail.com>
This commit is contained in:
Anuj Phogat 2013-10-02 18:02:20 -07:00
parent 77b440e42d
commit 0d69e8c813
2 changed files with 13 additions and 0 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

11
src/mesa/program/prog_statevars.c
View file

@ -349,6 +349,9 @@ _mesa_fetch_state(struct gl_context *ctx, const gl_state_index state[],
}
}
return;
case STATE_NUM_SAMPLES:
((int *)value)[0] = ctx->DrawBuffer->Visual.samples;
return;
case STATE_DEPTH_RANGE:
value[0] = ctx->Viewport.Near; /* near */
value[1] = ctx->Viewport.Far; /* far */
@ -665,6 +668,9 @@ _mesa_program_state_flags(const gl_state_index state[STATE_LENGTH])
case STATE_PROGRAM_MATRIX:
return _NEW_TRACK_MATRIX;
case STATE_NUM_SAMPLES:
return _NEW_BUFFERS;
case STATE_DEPTH_RANGE:
return _NEW_VIEWPORT;
@ -852,6 +858,9 @@ append_token(char *dst, gl_state_index k)
case STATE_TEXENV_COLOR:
append(dst, "texenv");
break;
case STATE_NUM_SAMPLES:
append(dst, "numsamples");
break;
case STATE_DEPTH_RANGE:
append(dst, "depth.range");
break;
@ -1027,6 +1036,8 @@ _mesa_program_state_string(const gl_state_index state[STATE_LENGTH])
break;
case STATE_FOG_COLOR:
break;
case STATE_NUM_SAMPLES:
break;
case STATE_DEPTH_RANGE:
break;
case STATE_FRAGMENT_PROGRAM:

2
src/mesa/program/prog_statevars.h
View file

@ -103,6 +103,8 @@ typedef enum gl_state_index_ {
STATE_TEXENV_COLOR,
STATE_NUM_SAMPLES, /* An integer, not a float like the other state vars */
STATE_DEPTH_RANGE,
STATE_VERTEX_PROGRAM,