diff options
| author | marha <marha@users.sourceforge.net> | 2013-02-07 10:17:56 +0100 |
|---|---|---|
| committer | marha <marha@users.sourceforge.net> | 2013-02-07 10:17:56 +0100 |
| commit | 956c20498738c242726b5a42ed28db8572a90bed (patch) | |
| tree | bf663b89417d0d9d7b37575eb0260d5a10af0e12 /mesalib/src/mesa/state_tracker/st_cb_drawpixels.c | |
| parent | 76c527be60066b647468ad66f8e4d7dd18fa1769 (diff) | |
| download | vcxsrv-956c20498738c242726b5a42ed28db8572a90bed.tar.gz vcxsrv-956c20498738c242726b5a42ed28db8572a90bed.tar.bz2 vcxsrv-956c20498738c242726b5a42ed28db8572a90bed.zip | |
mesa fontconfig git update 7 Feb 2013
fontconfig commit 96220a5ed9d1d761b14a7ac516ac6786c132f280
mesa commit 9ba1e23647c09290c98cc7133fb73dd1df1da8ab
Diffstat (limited to 'mesalib/src/mesa/state_tracker/st_cb_drawpixels.c')
| -rw-r--r-- | mesalib/src/mesa/state_tracker/st_cb_drawpixels.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/mesalib/src/mesa/state_tracker/st_cb_drawpixels.c b/mesalib/src/mesa/state_tracker/st_cb_drawpixels.c index 26d1923b5..ba4f17a3d 100644 --- a/mesalib/src/mesa/state_tracker/st_cb_drawpixels.c +++ b/mesalib/src/mesa/state_tracker/st_cb_drawpixels.c @@ -492,7 +492,7 @@ make_texture(struct st_context *st, /* Choose a pixel format for the temp texture which will hold the * image to draw. */ - pipeFormat = st_choose_format(pipe->screen, intFormat, format, type, + pipeFormat = st_choose_format(st, intFormat, format, type, PIPE_TEXTURE_2D, 0, PIPE_BIND_SAMPLER_VIEW, FALSE); assert(pipeFormat != PIPE_FORMAT_NONE); @@ -1499,7 +1499,7 @@ st_CopyPixels(struct gl_context *ctx, GLint srcx, GLint srcy, else { /* srcFormat can't be used as a texture format */ if (type == GL_DEPTH) { - texFormat = st_choose_format(screen, GL_DEPTH_COMPONENT, + texFormat = st_choose_format(st, GL_DEPTH_COMPONENT, GL_NONE, GL_NONE, st->internal_target, sample_count, PIPE_BIND_DEPTH_STENCIL, FALSE); @@ -1507,7 +1507,7 @@ st_CopyPixels(struct gl_context *ctx, GLint srcx, GLint srcy, } else { /* default color format */ - texFormat = st_choose_format(screen, GL_RGBA, + texFormat = st_choose_format(st, GL_RGBA, GL_NONE, GL_NONE, st->internal_target, sample_count, PIPE_BIND_SAMPLER_VIEW, FALSE); |