diff options
| author | marha <marha@users.sourceforge.net> | 2011-05-09 10:10:32 +0000 |
|---|---|---|
| committer | marha <marha@users.sourceforge.net> | 2011-05-09 10:10:32 +0000 |
| commit | 5bb5135182a1a50b1b6659d8aa5168ebfbe71979 (patch) | |
| tree | 7c8f16bf0832a90195bdbc4e8a9477158e0acf9b /mesalib/src/mesa/state_tracker | |
| parent | c721bc9b176ec37d8b80a92c89840658f8f6c458 (diff) | |
| parent | 43b2398ee28e9144fd51eb9994d67c4c9a198c9c (diff) | |
| download | vcxsrv-5bb5135182a1a50b1b6659d8aa5168ebfbe71979.tar.gz vcxsrv-5bb5135182a1a50b1b6659d8aa5168ebfbe71979.tar.bz2 vcxsrv-5bb5135182a1a50b1b6659d8aa5168ebfbe71979.zip | |
svn merge ^/branches/released .
Diffstat (limited to 'mesalib/src/mesa/state_tracker')
| -rw-r--r-- | mesalib/src/mesa/state_tracker/st_atom_sampler.c | 3 | ||||
| -rw-r--r-- | mesalib/src/mesa/state_tracker/st_extensions.c | 8 |
2 files changed, 11 insertions, 0 deletions
diff --git a/mesalib/src/mesa/state_tracker/st_atom_sampler.c b/mesalib/src/mesa/state_tracker/st_atom_sampler.c index 80e6cb02c..e1700d6a9 100644 --- a/mesalib/src/mesa/state_tracker/st_atom_sampler.c +++ b/mesalib/src/mesa/state_tracker/st_atom_sampler.c @@ -201,6 +201,9 @@ update_samplers(struct st_context *st) = st_compare_func_to_pipe(msamp->CompareFunc);
}
+ sampler->seamless_cube_map =
+ st->ctx->Texture.CubeMapSeamless || msamp->CubeMapSeamless;
+
st->state.num_samplers = su + 1;
/*printf("%s su=%u non-null\n", __FUNCTION__, su);*/
diff --git a/mesalib/src/mesa/state_tracker/st_extensions.c b/mesalib/src/mesa/state_tracker/st_extensions.c index 0c5e1991c..acad668d2 100644 --- a/mesalib/src/mesa/state_tracker/st_extensions.c +++ b/mesalib/src/mesa/state_tracker/st_extensions.c @@ -595,4 +595,12 @@ void st_init_extensions(struct st_context *st) PIPE_BIND_SAMPLER_VIEW)) {
ctx->Extensions.EXT_packed_float = GL_TRUE;
}
+
+ if (screen->get_param(screen, PIPE_CAP_SEAMLESS_CUBE_MAP_PER_TEXTURE)) {
+ ctx->Extensions.ARB_seamless_cube_map = GL_TRUE;
+ ctx->Extensions.AMD_seamless_cubemap_per_texture = GL_TRUE;
+ }
+ else if (screen->get_param(screen, PIPE_CAP_SEAMLESS_CUBE_MAP)) {
+ ctx->Extensions.ARB_seamless_cube_map = GL_TRUE;
+ }
}
|