Mesa (master): st/mesa: skip glDrawPixels/ glBitmap-related code for ES build

Brian Paul brianp at kemper.freedesktop.org
Tue Jan 4 15:29:40 UTC 2011


Module: Mesa
Branch: master
Commit: c94996f0570c729b9cb2b55329ababb9877fbbea
URL:    http://cgit.freedesktop.org/mesa/mesa/commit/?id=c94996f0570c729b9cb2b55329ababb9877fbbea

Author: Brian Paul <brianp at vmware.com>
Date:   Tue Jan  4 08:28:16 2011 -0700

st/mesa: skip glDrawPixels/glBitmap-related code for ES build

Fixes http://bugs.freedesktop.org/show_bug.cgi?id=32560

---

 src/mesa/state_tracker/st_program.c |    2 ++
 1 files changed, 2 insertions(+), 0 deletions(-)

diff --git a/src/mesa/state_tracker/st_program.c b/src/mesa/state_tracker/st_program.c
index e9e05ac..cabec14 100644
--- a/src/mesa/state_tracker/st_program.c
+++ b/src/mesa/state_tracker/st_program.c
@@ -409,6 +409,7 @@ 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;
@@ -434,6 +435,7 @@ st_translate_fragment_program(struct st_context *st,
       }
       stfp = st_fragment_program(fp);
    }
+#endif
 
    if (!stfp->tgsi.tokens) {
       /* need to translate Mesa instructions to TGSI now */




More information about the mesa-commit mailing list