Mesa (master): d3d1x: fix check for PIPE_CAP_CONDITIONAL_RENDER

[Christoph Bumiller]

Module: Mesa
Branch: master
Commit: f1f7645f23bd11fb54a992cdbe9ef0a6ee0136f3
URL:    http://cgit.freedesktop.org/mesa/mesa/commit/?id=f1f7645f23bd11fb54a992cdbe9ef0a6ee0136f3

Author: Christoph Bumiller <e0425955 at student.tuwien.ac.at>
Date:   Tue Oct 11 15:04:36 2011 +0200

d3d1x: fix check for PIPE_CAP_CONDITIONAL_RENDER

---

 .../state_trackers/d3d1x/gd3d11/d3d11_context.h    |    2 --
 .../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 2ab320a..afa4773 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 ca2636c..03a740f 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;