fdo-mirrors/mesa
1
0
Fork 0
mirror of https://gitlab.freedesktop.org/mesa/mesa.git synced 2026-01-03 18:00:10 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions 1

checkpoint: combine pixel transfer and user shader for glDrawPixels

Browse source
This commit is contained in:
Brian 2007-10-30 11:16:55 -06:00
parent b8042fb7fb
commit de38d9c498
1 changed files with 33 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

34
src/mesa/state_tracker/st_cb_drawpixels.c
View file

@ -33,9 +33,13 @@
#include "main/imports.h"
#include "main/image.h"
#include "main/macros.h"
#include "shader/program.h"
#include "shader/prog_parameter.h"
#include "shader/prog_print.h"
#include "st_context.h"
#include "st_atom.h"
#include "st_atom_constbuf.h"
#include "st_cache.h"
#include "st_draw.h"
#include "st_program.h"
@ -173,6 +177,34 @@ make_fragment_shader(struct st_context *st, GLboolean bitmapMode)
}
static struct st_fragment_program *
make_drawpix_fragment_shader(struct st_context *st)
{
GLcontext *ctx = st->ctx;
struct st_fragment_program *stfp;
struct gl_program *p;
printf("====== drawpix combine progs\n");
p = _mesa_combine_programs(ctx,
&st->pixel_transfer_program->Base,
&ctx->FragmentProgram._Current->Base);
_mesa_print_program(p);
printf("InputsRead: 0x%x\n", p->InputsRead);
printf("OutputsWritten: 0x%x\n", p->OutputsWritten);
_mesa_print_parameter_list(p->Parameters);
stfp = (struct st_fragment_program *) p;
st_translate_fragment_program(st, stfp, NULL,
stfp->tokens, ST_MAX_SHADER_TOKENS);
st_upload_constants( st, p->Parameters, PIPE_SHADER_FRAGMENT );
return stfp;
}
/**
* Create fragment shader that does a TEX() instruction to get a Z
* value, then writes to FRAG_RESULT_DEPR.
@ -899,7 +931,7 @@ st_DrawPixels(GLcontext *ctx, GLint x, GLint y, GLsizei width, GLsizei height,
}
else {
ps = st->state.framebuffer.cbufs[0];
stfp = make_fragment_shader(ctx->st, GL_FALSE);
stfp = make_drawpix_fragment_shader(ctx->st);
stvp = make_vertex_shader(ctx->st, GL_FALSE);
color = NULL;
}