#include "main/imports.h"
#include "main/mtypes.h"
#include "main/framebuffer.h"
+#include "main/state.h"
#include "main/texobj.h"
#include "main/texstate.h"
#include "program/program.h"
#include "st_atom.h"
#include "st_program.h"
#include "st_texture.h"
+#include "st_util.h"
static unsigned
void
st_update_fp( struct st_context *st )
{
- struct st_fragment_program *stfp;
+ struct st_program *stfp;
assert(st->ctx->FragmentProgram._Current);
- stfp = st_fragment_program(st->ctx->FragmentProgram._Current);
+ stfp = st_program(st->ctx->FragmentProgram._Current);
assert(stfp->Base.Target == GL_FRAGMENT_PROGRAM_ARB);
void *shader;
!stfp->ati_fs && /* ATI_fragment_shader always has multiple variants */
!stfp->Base.ExternalSamplersUsed && /* external samplers need variants */
stfp->variants &&
- !stfp->variants->key.drawpixels &&
- !stfp->variants->key.bitmap) {
+ !st_fp_variant(stfp->variants)->key.drawpixels &&
+ !st_fp_variant(stfp->variants)->key.bitmap) {
shader = stfp->variants->driver_shader;
} else {
struct st_fp_variant_key key;
key.st = st->has_shareable_shaders ? NULL : st;
+ key.lower_flatshade = st->lower_flatshade &&
+ st->ctx->Light.ShadeModel == GL_FLAT;
+
+ /* _NEW_COLOR */
+ key.lower_alpha_func = COMPARE_FUNC_NEVER;
+ if (st->lower_alpha_test && _mesa_is_alpha_test_enabled(st->ctx))
+ key.lower_alpha_func = st->ctx->Color.AlphaFunc;
+
+ /* _NEW_LIGHT | _NEW_PROGRAM */
+ key.lower_two_sided_color = st->lower_two_sided_color &&
+ _mesa_vertex_program_two_side_enabled(st->ctx);
+
/* _NEW_FRAG_CLAMP */
key.clamp_color = st->clamp_frag_color_in_shader &&
st->ctx->Color._ClampFragmentColor;
key.external = st_get_external_sampler_key(st, &stfp->Base);
- shader = st_get_fp_variant(st, stfp, &key)->driver_shader;
+ shader = st_get_fp_variant(st, stfp, &key)->base.driver_shader;
}
- st_reference_fragprog(st, &st->fp, stfp);
+ st_reference_prog(st, &st->fp, stfp);
cso_set_fragment_shader_handle(st->cso_context, shader);
}
void
st_update_vp( struct st_context *st )
{
- struct st_vertex_program *stvp;
+ struct st_program *stvp;
/* find active shader and params -- Should be covered by
* ST_NEW_VERTEX_PROGRAM
*/
assert(st->ctx->VertexProgram._Current);
- stvp = st_vertex_program(st->ctx->VertexProgram._Current);
+ stvp = st_program(st->ctx->VertexProgram._Current);
assert(stvp->Base.Target == GL_VERTEX_PROGRAM_ARB);
if (st->shader_has_one_variant[MESA_SHADER_VERTEX] &&
stvp->variants &&
- stvp->variants->key.passthrough_edgeflags == st->vertdata_edgeflags) {
- st->vp_variant = stvp->variants;
+ st_common_variant(stvp->variants)->key.passthrough_edgeflags == st->vertdata_edgeflags) {
+ st->vp_variant = st_common_variant(stvp->variants);
} else {
- struct st_vp_variant_key key;
+ struct st_common_variant_key key;
memset(&key, 0, sizeof(key));
key.clip_negative_one_to_one =
st->ctx->Transform.ClipDepthMode == GL_NEGATIVE_ONE_TO_ONE;
+ /* _NEW_POINT */
+ key.lower_point_size = st->lower_point_size &&
+ !st_point_size_per_vertex(st->ctx);
+
+ /* _NEW_TRANSFORM */
+ if (st->lower_ucp && st_user_clip_planes_enabled(st->ctx))
+ key.lower_ucp = st->ctx->Transform.ClipPlanesEnabled;
+
st->vp_variant = st_get_vp_variant(st, stvp, &key);
}
- st_reference_vertprog(st, &st->vp, stvp);
+ st_reference_prog(st, &st->vp, stvp);
cso_set_vertex_shader_handle(st->cso_context,
- st->vp_variant->driver_shader);
+ st->vp_variant->base.driver_shader);
}
static void *
st_update_common_program(struct st_context *st, struct gl_program *prog,
- unsigned pipe_shader, struct st_common_program **dst)
+ unsigned pipe_shader, struct st_program **dst)
{
- struct st_common_program *stp;
+ struct st_program *stp;
if (!prog) {
st_reference_prog(st, dst, NULL);
return NULL;
}
- stp = st_common_program(prog);
+ stp = st_program(prog);
st_reference_prog(st, dst, stp);
if (st->shader_has_one_variant[prog->info.stage] && stp->variants)
return stp->variants->driver_shader;
- struct st_basic_variant_key key;
+ struct st_common_variant_key key;
/* use memset, not an initializer to be sure all memory is zeroed */
memset(&key, 0, sizeof(key));
}
- return st_get_basic_variant(st, stp, &key)->driver_shader;
+ return st_get_common_variant(st, stp, &key)->driver_shader;
}