diff options
| author | marha <marha@users.sourceforge.net> | 2014-09-08 23:27:52 +0200 |
|---|---|---|
| committer | marha <marha@users.sourceforge.net> | 2014-09-08 23:27:52 +0200 |
| commit | cb346e228aeb500cd61ec86644c034c238332d3b (patch) | |
| tree | 5902a043a3643391e689ebb146e6fd02af1c4b8e /mesalib/src/mesa/state_tracker/st_extensions.c | |
| parent | 4aef26e36bc9aba4cd67c158e17f5fb93c9e018c (diff) | |
| download | vcxsrv-cb346e228aeb500cd61ec86644c034c238332d3b.tar.gz vcxsrv-cb346e228aeb500cd61ec86644c034c238332d3b.tar.bz2 vcxsrv-cb346e228aeb500cd61ec86644c034c238332d3b.zip | |
xkeyboard-config mesa git update 8 Sep 2014
xkeyboard-config commit 1b9901151cdb22e413319e6fca80fbbfc5e51502
mesa commit 12fb74fe895fe9954df127ca0ec6e4422fffb156
Diffstat (limited to 'mesalib/src/mesa/state_tracker/st_extensions.c')
| -rw-r--r-- | mesalib/src/mesa/state_tracker/st_extensions.c | 13 |
1 files changed, 10 insertions, 3 deletions
diff --git a/mesalib/src/mesa/state_tracker/st_extensions.c b/mesalib/src/mesa/state_tracker/st_extensions.c index 9db648c03..07bd12567 100644 --- a/mesalib/src/mesa/state_tracker/st_extensions.c +++ b/mesalib/src/mesa/state_tracker/st_extensions.c @@ -34,6 +34,7 @@ #include "pipe/p_context.h" #include "pipe/p_defines.h" #include "pipe/p_screen.h" +#include "util/u_math.h" #include "st_context.h" #include "st_extensions.h" @@ -274,8 +275,6 @@ void st_init_limits(struct pipe_screen *screen, c->MinProgramTextureGatherOffset = screen->get_param(screen, PIPE_CAP_MIN_TEXTURE_GATHER_OFFSET); c->MaxProgramTextureGatherOffset = screen->get_param(screen, PIPE_CAP_MAX_TEXTURE_GATHER_OFFSET); - c->UniformBooleanTrue = ~0; - c->MaxTransformFeedbackBuffers = screen->get_param(screen, PIPE_CAP_MAX_STREAM_OUTPUT_BUFFERS); c->MaxTransformFeedbackBuffers = MIN2(c->MaxTransformFeedbackBuffers, MAX_FEEDBACK_BUFFERS); @@ -621,7 +620,6 @@ void st_init_extensions(struct pipe_screen *screen, extensions->NV_fog_distance = GL_TRUE; extensions->NV_texture_env_combine4 = GL_TRUE; extensions->NV_texture_rectangle = GL_TRUE; - extensions->NV_vdpau_interop = GL_TRUE; extensions->OES_EGL_image = GL_TRUE; extensions->OES_EGL_image_external = GL_TRUE; @@ -700,6 +698,8 @@ void st_init_extensions(struct pipe_screen *screen, } } + consts->UniformBooleanTrue = consts->NativeIntegers ? ~0 : fui(1.0f); + /* Below are the cases which cannot be moved into tables easily. */ if (!has_lib_dxtc && !options->force_s3tc_enable) { @@ -884,4 +884,11 @@ void st_init_extensions(struct pipe_screen *screen, PIPE_BIND_SAMPLER_VIEW)) { extensions->ARB_ES3_compatibility = GL_TRUE; } + + if (screen->get_video_param && + screen->get_video_param(screen, PIPE_VIDEO_PROFILE_UNKNOWN, + PIPE_VIDEO_ENTRYPOINT_BITSTREAM, + PIPE_VIDEO_CAP_SUPPORTS_INTERLACED)) { + extensions->NV_vdpau_interop = GL_TRUE; + } } |