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.
This commit is contained in:
Brian 2007-10-30 11:32:16 -06:00
parent cbdff56f8c
commit ab3f6015aa
2 changed files with 10 additions and 2 deletions

View file

@ -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;
}

View file

@ -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,