diff options
| author | Bryan Cain <bryancain3@gmail.com> | 2011-08-04 15:43:34 -0500 |
|---|---|---|
| committer | Bryan Cain <bryancain3@gmail.com> | 2011-08-04 15:43:34 -0500 |
| commit | 4683529048ee133481b2d8f1cae1685aa1736f9a (patch) | |
| tree | e02d90f4164e4dc6259000c358d65e6af84a3a31 /src/mesa/state_tracker/st_texture.h | |
| parent | 50073563b2bfe3716b3dc8b1ed2f91381ba24305 (diff) | |
| parent | 9adcab9cd464d659288e31e6767efb5dee3894ff (diff) | |
Merge branch 'glsl-to-tgsi'
Conflicts:
src/mesa/state_tracker/st_atom_pixeltransfer.c
src/mesa/state_tracker/st_program.c
Diffstat (limited to 'src/mesa/state_tracker/st_texture.h')
| -rw-r--r-- | src/mesa/state_tracker/st_texture.h | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/src/mesa/state_tracker/st_texture.h b/src/mesa/state_tracker/st_texture.h index d50c3c9af79..b822f47cf9e 100644 --- a/src/mesa/state_tracker/st_texture.h +++ b/src/mesa/state_tracker/st_texture.h @@ -232,4 +232,8 @@ st_texture_image_copy(struct pipe_context *pipe, struct pipe_resource *src, GLuint srcLevel, GLuint face); + +extern struct pipe_resource * +st_create_color_map_texture(struct gl_context *ctx); + #endif |