d3d1x: fix check for PIPE_CAP_CONDITIONAL_RENDER

diff --git a/src/gallium/state_trackers/d3d1x/gd3d11/d3d11_context.h b/src/gallium/state_trackers/d3d1x/gd3d11/d3d11_context.h
index 2ab320ab3319858dbe1eeb24e759c3c15100c1cb..afa4773295af4b4340924ae3c6bef61d8d6b0f9c 100644 (file)
--- 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 ca2636cb6bab55ca3bc477c92a2d79ad96c12347..03a740f02f958eac8357daef046d4884f5df968f 100644 (file)
--- 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;