Disable debug code.

Basic code for PixelTranslfer ops and glDrawPixels works now.
A pixel transfer program is generated and combined with the current
fragment shader.

diff --git a/src/mesa/state_tracker/st_atom_pixeltransfer.c b/src/mesa/state_tracker/st_atom_pixeltransfer.c
index b1fce81755892a8a97076778213e2c8acc219e2f..d3abf87d7dbc24285ca91c028124b8decdefc6a4 100644 (file)
--- a/src/mesa/state_tracker/st_atom_pixeltransfer.c
+++ b/src/mesa/state_tracker/st_atom_pixeltransfer.c
@@ -128,9 +128,11 @@ get_pixel_transfer_program(GLcontext *ctx)
    fp->Base.NumInstructions = ic;
    fp->Base.Parameters = params;
 
+#if 0
    printf("========= pixel transfer prog\n");
    _mesa_print_program(&fp->Base);
    _mesa_print_parameter_list(fp->Base.Parameters);
+#endif
 
    return fp;
 }

diff --git a/src/mesa/state_tracker/st_cb_drawpixels.c b/src/mesa/state_tracker/st_cb_drawpixels.c
index ed0ef71192d244a80c87ceba6d86a89ff5c78795..ff7aa7d74b50bc372c9e99aa853daed111cfdcfd 100644 (file)
--- a/src/mesa/state_tracker/st_cb_drawpixels.c
+++ b/src/mesa/state_tracker/st_cb_drawpixels.c
@@ -184,15 +184,21 @@ make_drawpix_fragment_shader(struct st_context *st)
    struct st_fragment_program *stfp;
    struct gl_program *p;
 
-   printf("====== drawpix combine progs\n");
+   /*
+    * XXX Use st_program's serial numbers to determine when the
+    * user-provided program and pixel-transfer program to avoid
+    * needless combining/translation here.
+    */
+
    p = _mesa_combine_programs(ctx,
                               &st->pixel_transfer_program->Base,
                               &ctx->FragmentProgram._Current->Base);
-
+#if 0
    _mesa_print_program(p);
    printf("InputsRead: 0x%x\n", p->InputsRead);
    printf("OutputsWritten: 0x%x\n", p->OutputsWritten);
    _mesa_print_parameter_list(p->Parameters);
+#endif
 
    stfp = (struct st_fragment_program *) p;
    st_translate_fragment_program(st, stfp, NULL,