diff options
| author | marha <marha@users.sourceforge.net> | 2012-07-06 09:31:01 +0200 |
|---|---|---|
| committer | marha <marha@users.sourceforge.net> | 2012-07-06 09:31:01 +0200 |
| commit | 405ae9defaaa03d4d305b6264a744107c3dd460d (patch) | |
| tree | e119a54d876fa737d859718afbde7ef507702631 /mesalib/src/mesa/state_tracker | |
| parent | 3a5976985ab1ca641b095a72730f1f3d3bd5f9bc (diff) | |
| parent | 336bad93d146931c160d8517edfdf0bee49ad9f7 (diff) | |
| download | vcxsrv-405ae9defaaa03d4d305b6264a744107c3dd460d.tar.gz vcxsrv-405ae9defaaa03d4d305b6264a744107c3dd460d.tar.bz2 vcxsrv-405ae9defaaa03d4d305b6264a744107c3dd460d.zip | |
Merge remote-tracking branch 'origin/released'
Conflicts:
xorg-server/dix/dispatch.c
xorg-server/dix/privates.c
xorg-server/hw/kdrive/ephyr/ephyr.c
xorg-server/hw/kdrive/src/kinput.c
Diffstat (limited to 'mesalib/src/mesa/state_tracker')
| -rw-r--r-- | mesalib/src/mesa/state_tracker/st_extensions.c | 5 | ||||
| -rw-r--r-- | mesalib/src/mesa/state_tracker/st_program.c | 4 |
2 files changed, 3 insertions, 6 deletions
diff --git a/mesalib/src/mesa/state_tracker/st_extensions.c b/mesalib/src/mesa/state_tracker/st_extensions.c index 6fea1fa08..fd9507536 100644 --- a/mesalib/src/mesa/state_tracker/st_extensions.c +++ b/mesalib/src/mesa/state_tracker/st_extensions.c @@ -578,6 +578,7 @@ void st_init_extensions(struct st_context *st) /* Extensions that only depend on GLSL 1.3. */ ctx->Extensions.ARB_conservative_depth = GL_TRUE; + ctx->Extensions.ARB_shader_bit_encoding = GL_TRUE; } else { /* Optional integer support for GLSL 1.2. */ if (screen->get_shader_param(screen, PIPE_SHADER_VERTEX, @@ -595,10 +596,6 @@ void st_init_extensions(struct st_context *st) ctx->Extensions.S3_s3tc = GL_FALSE; } - if (ctx->Const.NativeIntegers) { - ctx->Extensions.ARB_shader_bit_encoding = GL_TRUE; - } - if (screen->get_shader_param(screen, PIPE_SHADER_GEOMETRY, PIPE_SHADER_CAP_MAX_INSTRUCTIONS) > 0) { #if 0 /* XXX re-enable when GLSL compiler again supports geometry shaders */ diff --git a/mesalib/src/mesa/state_tracker/st_program.c b/mesalib/src/mesa/state_tracker/st_program.c index e6664fb7c..9f98298b4 100644 --- a/mesalib/src/mesa/state_tracker/st_program.c +++ b/mesalib/src/mesa/state_tracker/st_program.c @@ -569,12 +569,12 @@ st_translate_fragment_program(struct st_context *st, case FRAG_ATTRIB_CLIP_DIST0: input_semantic_name[slot] = TGSI_SEMANTIC_CLIPDIST; input_semantic_index[slot] = 0; - interpMode[slot] = TGSI_INTERPOLATE_LINEAR; + interpMode[slot] = TGSI_INTERPOLATE_PERSPECTIVE; break; case FRAG_ATTRIB_CLIP_DIST1: input_semantic_name[slot] = TGSI_SEMANTIC_CLIPDIST; input_semantic_index[slot] = 1; - interpMode[slot] = TGSI_INTERPOLATE_LINEAR; + interpMode[slot] = TGSI_INTERPOLATE_PERSPECTIVE; break; /* In most cases, there is nothing special about these * inputs, so adopt a convention to use the generic |