From 210218bb96fce822ad58df6b6fdd41350c6fbdf8 Mon Sep 17 00:00:00 2001 From: Vinson Lee Date: Sun, 25 Apr 2010 21:42:19 -0700 Subject: st/wgl: s/st_manager_create_api/st_gl_api_create/ commit 0c572c6828b6a338b07a6860280b3a314a81662e replaced st_manager_create_api with st_gl_api_create. Fixes MSVC build. --- src/gallium/state_trackers/wgl/stw_st.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'src/gallium/state_trackers/wgl') diff --git a/src/gallium/state_trackers/wgl/stw_st.c b/src/gallium/state_trackers/wgl/stw_st.c index f4ea61ed2c..bcdd82e4f6 100644 --- a/src/gallium/state_trackers/wgl/stw_st.c +++ b/src/gallium/state_trackers/wgl/stw_st.c @@ -27,7 +27,7 @@ #include "util/u_memory.h" #include "util/u_inlines.h" -#include "state_tracker/st_manager.h" /* for st_manager_create_api */ +#include "state_tracker/st_gl_api.h" /* for st_gl_api_create */ #include "stw_st.h" #include "stw_device.h" @@ -308,5 +308,5 @@ stw_st_swap_framebuffer_locked(struct st_framebuffer_iface *stfb) struct st_api * stw_st_create_api(void) { - return st_manager_create_api(); + return st_gl_api_create(); } -- cgit v1.2.3 From a127e4709dcafa409dde25061481c130064a1c42 Mon Sep 17 00:00:00 2001 From: Roland Scheidegger Date: Mon, 17 May 2010 21:33:45 +0200 Subject: st/wgl: adapt to interface changes --- src/gallium/state_trackers/wgl/stw_pixelformat.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'src/gallium/state_trackers/wgl') diff --git a/src/gallium/state_trackers/wgl/stw_pixelformat.c b/src/gallium/state_trackers/wgl/stw_pixelformat.c index 11e779d25f..e606477e97 100644 --- a/src/gallium/state_trackers/wgl/stw_pixelformat.c +++ b/src/gallium/state_trackers/wgl/stw_pixelformat.c @@ -225,8 +225,8 @@ stw_pixelformat_init( void ) for(j = 0; j < Elements(stw_pf_color); ++j) { const struct stw_pf_color_info *color = &stw_pf_color[j]; - if(!screen->is_format_supported(screen, color->format, PIPE_TEXTURE_2D, - PIPE_BIND_RENDER_TARGET | + if(!screen->is_format_supported(screen, color->format, PIPE_TEXTURE_2D, + 0, PIPE_BIND_RENDER_TARGET | PIPE_BIND_DISPLAY_TARGET, 0)) continue; @@ -237,7 +237,7 @@ stw_pixelformat_init( void ) const struct stw_pf_depth_info *depth = &stw_pf_depth_stencil[l]; if(!screen->is_format_supported(screen, depth->format, PIPE_TEXTURE_2D, - PIPE_BIND_DEPTH_STENCIL, 0)) + 0, PIPE_BIND_DEPTH_STENCIL, 0)) continue; stw_pixelformat_add( stw_dev, color, depth, 0, doublebuffer, samples ); -- cgit v1.2.3