diff options
| author | Christoph Bumiller <[email protected]> | 2011-10-11 15:04:36 +0200 |
|---|---|---|
| committer | Christoph Bumiller <[email protected]> | 2011-10-13 11:04:08 +0200 |
| commit | f1f7645f23bd11fb54a992cdbe9ef0a6ee0136f3 (patch) | |
| tree | 7f4d10273e843df7baca6b52d155f64170948fc1 | |
| parent | 983fa4ad523535debf2e94cf6ac1fd4c5630c0d2 (diff) | |
d3d1x: fix check for PIPE_CAP_CONDITIONAL_RENDER
| -rw-r--r-- | src/gallium/state_trackers/d3d1x/gd3d11/d3d11_context.h | 2 | ||||
| -rw-r--r-- | src/gallium/state_trackers/d3d1x/gd3d11/d3d11_screen.h | 2 |
2 files changed, 1 insertions, 3 deletions
diff --git a/src/gallium/state_trackers/d3d1x/gd3d11/d3d11_context.h b/src/gallium/state_trackers/d3d1x/gd3d11/d3d11_context.h index 2ab320ab331..afa4773295a 100644 --- a/src/gallium/state_trackers/d3d1x/gd3d11/d3d11_context.h +++ b/src/gallium/state_trackers/d3d1x/gd3d11/d3d11_context.h @@ -150,8 +150,6 @@ struct GalliumD3D10Device : public GalliumD3D10ScreenImpl<threadsafe> { if(!pipe->begin_query) caps.queries = false; - if(!pipe->render_condition || !screen->get_param(screen, PIPE_CAP_CONDITIONAL_RENDER)) - caps.render_condition = false; if(!pipe->bind_gs_state) { caps.gs = false; diff --git a/src/gallium/state_trackers/d3d1x/gd3d11/d3d11_screen.h b/src/gallium/state_trackers/d3d1x/gd3d11/d3d11_screen.h index ca2636cb6ba..03a740f02f9 100644 --- a/src/gallium/state_trackers/d3d1x/gd3d11/d3d11_screen.h +++ b/src/gallium/state_trackers/d3d1x/gd3d11/d3d11_screen.h @@ -90,7 +90,7 @@ struct GalliumD3D11ScreenImpl : public GalliumD3D11Screen screen_caps.gs = screen->get_shader_param(screen, PIPE_SHADER_GEOMETRY, PIPE_SHADER_CAP_MAX_INSTRUCTIONS) > 0; screen_caps.so = !!screen->get_param(screen, PIPE_CAP_STREAM_OUTPUT); screen_caps.queries = screen->get_param(screen, PIPE_CAP_OCCLUSION_QUERY); - screen_caps.render_condition = screen_caps.queries; + screen_caps.render_condition = screen->get_param(screen, PIPE_CAP_CONDITIONAL_RENDER); for(unsigned i = 0; i < PIPE_SHADER_TYPES; ++i) screen_caps.constant_buffers[i] = screen->get_shader_param(screen, i, PIPE_SHADER_CAP_MAX_CONST_BUFFERS); screen_caps.stages = 0; |