diff options
| author | marha <marha@users.sourceforge.net> | 2011-03-05 16:07:07 +0000 |
|---|---|---|
| committer | marha <marha@users.sourceforge.net> | 2011-03-05 16:07:07 +0000 |
| commit | f027c29436a689abc94b720c2efebeddd449a61f (patch) | |
| tree | e3179c623fdf42025ad9adbc401ccb111608036e /mesalib/src/mesa | |
| parent | 3592ad31cfc72ffff3c9024eecea7d3b987c7954 (diff) | |
| parent | 98e55fbde340d17fdd0b1cbc408af5fecb4b7a0e (diff) | |
| download | vcxsrv-f027c29436a689abc94b720c2efebeddd449a61f.tar.gz vcxsrv-f027c29436a689abc94b720c2efebeddd449a61f.tar.bz2 vcxsrv-f027c29436a689abc94b720c2efebeddd449a61f.zip | |
svn merge ^/branches/released .
Diffstat (limited to 'mesalib/src/mesa')
| -rw-r--r-- | mesalib/src/mesa/sources.mak | 1 | ||||
| -rw-r--r-- | mesalib/src/mesa/state_tracker/st_cb_texture.c | 11 |
2 files changed, 10 insertions, 2 deletions
diff --git a/mesalib/src/mesa/sources.mak b/mesalib/src/mesa/sources.mak index 8cf629d16..e1598869c 100644 --- a/mesalib/src/mesa/sources.mak +++ b/mesalib/src/mesa/sources.mak @@ -254,6 +254,7 @@ PROGRAM_SOURCES = \ program/register_allocate.c \
program/symbol_table.c
+
SHADER_CXX_SOURCES = \
program/ir_to_mesa.cpp \
program/sampler.cpp
diff --git a/mesalib/src/mesa/state_tracker/st_cb_texture.c b/mesalib/src/mesa/state_tracker/st_cb_texture.c index cea2a4a8d..17dab2f1a 100644 --- a/mesalib/src/mesa/state_tracker/st_cb_texture.c +++ b/mesalib/src/mesa/state_tracker/st_cb_texture.c @@ -227,8 +227,15 @@ default_bindings(struct st_context *st, enum pipe_format format) if (screen->is_format_supported(screen, format, target, 0, bindings, geom))
return bindings;
- else
- return PIPE_BIND_SAMPLER_VIEW;
+ else {
+ /* Try non-sRGB. */
+ format = util_format_linear(format);
+
+ if (screen->is_format_supported(screen, format, target, 0, bindings, geom))
+ return bindings;
+ else
+ return PIPE_BIND_SAMPLER_VIEW;
+ }
}
|