diff options
| author | marha <marha@users.sourceforge.net> | 2011-06-20 09:35:03 +0200 |
|---|---|---|
| committer | marha <marha@users.sourceforge.net> | 2011-06-20 09:35:03 +0200 |
| commit | 6dbcc9a627a91ad8ef03f5074a4fc3c726cdfd80 (patch) | |
| tree | b35ca00e86dfcff8ca05b8e4737cd10b7545c2fb /mesalib/src/mesa/state_tracker | |
| parent | 9bea2bf9069195c27824644331d4a275ea3df9f4 (diff) | |
| parent | 4703c93aaecf0d5794eca723cd5b1b72b04d04ee (diff) | |
| download | vcxsrv-6dbcc9a627a91ad8ef03f5074a4fc3c726cdfd80.tar.gz vcxsrv-6dbcc9a627a91ad8ef03f5074a4fc3c726cdfd80.tar.bz2 vcxsrv-6dbcc9a627a91ad8ef03f5074a4fc3c726cdfd80.zip | |
Merge remote-tracking branch 'origin/released'
Conflicts:
mesalib/common.py
mesalib/scons/custom.py
mesalib/scons/gallium.py
mesalib/src/gallium/auxiliary/util/u_vbuf_mgr.c
mesalib/src/mesa/main/fbobject.c
mesalib/src/mesa/main/teximage.c
mesalib/src/mesa/main/texobj.c
mesalib/src/mesa/state_tracker/st_format.c
xorg-server/configure.ac
xorg-server/exa/exa_unaccel.c
Diffstat (limited to 'mesalib/src/mesa/state_tracker')
| -rw-r--r-- | mesalib/src/mesa/state_tracker/st_format.c | 16 |
1 files changed, 8 insertions, 8 deletions
diff --git a/mesalib/src/mesa/state_tracker/st_format.c b/mesalib/src/mesa/state_tracker/st_format.c index 1354d26b4..dcd6ea5cc 100644 --- a/mesalib/src/mesa/state_tracker/st_format.c +++ b/mesalib/src/mesa/state_tracker/st_format.c @@ -1108,7 +1108,7 @@ static struct format_mapping format_map[] = { * Return first supported format from the given list.
*/
static enum pipe_format
-find_supported_format(struct pipe_screen *screen,
+find_supported_format(struct pipe_screen *screen,
const enum pipe_format formats[],
enum pipe_texture_target target,
unsigned sample_count,
@@ -1188,9 +1188,6 @@ st_choose_renderbuffer_format(struct pipe_screen *screen, }
-/**
- * Called via ctx->Driver.chooseTextureFormat().
- */
gl_format
st_ChooseTextureFormat_renderable(struct gl_context *ctx, GLint internalFormat,
GLenum format, GLenum type, GLboolean renderable)
@@ -1206,11 +1203,10 @@ st_ChooseTextureFormat_renderable(struct gl_context *ctx, GLint internalFormat, * that in advance. Specify potential render target flags now.
*/
bindings = PIPE_BIND_SAMPLER_VIEW;
- if (renderable == GL_TRUE) {
- if (_mesa_is_depth_format(internalFormat) ||
- _mesa_is_depth_or_stencil_format(internalFormat))
+ if (renderable) {
+ if (_mesa_is_depth_or_stencil_format(internalFormat))
bindings |= PIPE_BIND_DEPTH_STENCIL;
- else
+ else
bindings |= PIPE_BIND_RENDER_TARGET;
}
@@ -1231,6 +1227,10 @@ st_ChooseTextureFormat_renderable(struct gl_context *ctx, GLint internalFormat, return st_pipe_format_to_mesa_format(pFormat);
}
+
+/**
+ * Called via ctx->Driver.ChooseTextureFormat().
+ */
gl_format
st_ChooseTextureFormat(struct gl_context *ctx, GLint internalFormat,
GLenum format, GLenum type)
|