diff options
author | marha <marha@users.sourceforge.net> | 2012-09-17 16:10:59 +0200 |
---|---|---|
committer | marha <marha@users.sourceforge.net> | 2012-09-17 16:10:59 +0200 |
commit | e3c4aa34268f99562e66b43a7d9efcd16ca072e6 (patch) | |
tree | 8c827f3f78e2c2093734b68045f2a13045ca15d0 /mesalib/src/mesa/state_tracker/st_program.c | |
parent | b08ba56019b146786e1cde553c036dd0c4fd02e5 (diff) | |
download | vcxsrv-e3c4aa34268f99562e66b43a7d9efcd16ca072e6.tar.gz vcxsrv-e3c4aa34268f99562e66b43a7d9efcd16ca072e6.tar.bz2 vcxsrv-e3c4aa34268f99562e66b43a7d9efcd16ca072e6.zip |
mesa xserver pixman git update 17 sep 2012
Diffstat (limited to 'mesalib/src/mesa/state_tracker/st_program.c')
-rw-r--r-- | mesalib/src/mesa/state_tracker/st_program.c | 4 |
1 files changed, 0 insertions, 4 deletions
diff --git a/mesalib/src/mesa/state_tracker/st_program.c b/mesalib/src/mesa/state_tracker/st_program.c index 9816e22ac..ac066a766 100644 --- a/mesalib/src/mesa/state_tracker/st_program.c +++ b/mesalib/src/mesa/state_tracker/st_program.c @@ -66,10 +66,8 @@ delete_vp_variant(struct st_context *st, struct st_vp_variant *vpv) if (vpv->driver_shader) cso_delete_vertex_shader(st->cso_context, vpv->driver_shader); -#if FEATURE_feedback || FEATURE_rastpos if (vpv->draw_shader) draw_delete_vertex_shader( st->draw, vpv->draw_shader ); -#endif if (vpv->tgsi.tokens) st_free_tokens(vpv->tgsi.tokens); @@ -497,7 +495,6 @@ st_translate_fragment_program(struct st_context *st, assert(!(key->bitmap && key->drawpixels)); -#if FEATURE_drawpix if (key->bitmap) { /* glBitmap drawing */ struct gl_fragment_program *fp; /* we free this temp program below */ @@ -525,7 +522,6 @@ st_translate_fragment_program(struct st_context *st, } stfp = st_fragment_program(fp); } -#endif if (!stfp->glsl_to_tgsi) _mesa_remove_output_reads(&stfp->Base.Base, PROGRAM_OUTPUT); |