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_texture.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_texture.c')
-rw-r--r-- | mesalib/src/mesa/state_tracker/st_texture.c | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/mesalib/src/mesa/state_tracker/st_texture.c b/mesalib/src/mesa/state_tracker/st_texture.c index 584eaa981..ed3709848 100644 --- a/mesalib/src/mesa/state_tracker/st_texture.c +++ b/mesalib/src/mesa/state_tracker/st_texture.c @@ -391,13 +391,12 @@ struct pipe_resource * st_create_color_map_texture(struct gl_context *ctx) { struct st_context *st = st_context(ctx); - struct pipe_context *pipe = st->pipe; struct pipe_resource *pt; enum pipe_format format; const uint texSize = 256; /* simple, and usually perfect */ /* find an RGBA texture format */ - format = st_choose_format(pipe->screen, GL_RGBA, GL_NONE, GL_NONE, + format = st_choose_format(st, GL_RGBA, GL_NONE, GL_NONE, PIPE_TEXTURE_2D, 0, PIPE_BIND_SAMPLER_VIEW, FALSE); |