AlexIndustrial/mesa
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

st/glx: adapt to interface changes

Browse Source
This commit is contained in:
Roland Scheidegger
2010-05-17 21:33:53 +02:00
parent a127e4709d
commit 685bb69416
2 changed files with 11 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/gallium/state_trackers/glx/xlib/xm_api.c
+3 -1
View File
@@ -342,6 +342,7 @@ choose_depth_stencil_format(XMesaDisplay xmdpy, int depth, int stencil)
const unsigned tex_usage = PIPE_BIND_DEPTH_STENCIL;
const unsigned geom_flags = (PIPE_TEXTURE_GEOM_NON_SQUARE |
PIPE_TEXTURE_GEOM_NON_POWER_OF_TWO);
const unsigned sample_count = 0;
enum pipe_format formats[8], fmt;
int count, i;
@@ -365,7 +366,8 @@ choose_depth_stencil_format(XMesaDisplay xmdpy, int depth, int stencil)
fmt = PIPE_FORMAT_NONE;
for (i = 0; i < count; i++) {
if (xmdpy->screen->is_format_supported(xmdpy->screen, formats[i],
target, tex_usage, geom_flags)) {
target, sample_count,
tex_usage, geom_flags)) {
fmt = formats[i];
break;
}
src/gallium/state_trackers/glx/xlib/xm_st.c
+8 -10
View File
@@ -96,7 +96,7 @@ xmesa_st_framebuffer_copy_textures(struct st_framebuffer_iface *stfbi,
struct xmesa_st_framebuffer *xstfb = xmesa_st_framebuffer(stfbi);
struct pipe_resource *src_ptex = xstfb->textures[src_statt];
struct pipe_resource *dst_ptex = xstfb->textures[dst_statt];
struct pipe_surface *src, *dst;
struct pipe_subresource subsrc, subdst;
struct pipe_context *pipe;
if (!src_ptex || !dst_ptex)
@@ -110,16 +110,14 @@ xmesa_st_framebuffer_copy_textures(struct st_framebuffer_iface *stfbi,
xstfb->display->pipe = pipe;
}
src = xstfb->screen->get_tex_surface(xstfb->screen,
src_ptex, 0, 0, 0, PIPE_BIND_BLIT_SOURCE);
dst = xstfb->screen->get_tex_surface(xstfb->screen,
dst_ptex, 0, 0, 0, PIPE_BIND_BLIT_DESTINATION);
subsrc.face = 0;
subsrc.level = 0;
subdst.face = 0;
subdst.level = 0;
if (src && dst)
pipe->surface_copy(pipe, dst, x, y, src, x, y, width, height);
pipe_surface_reference(&src, NULL);
pipe_surface_reference(&dst, NULL);
if (src_ptex && dst_ptex)
pipe->resource_copy_region(pipe, dst_ptex, subdst, x, y, 0,
src_ptex, subsrc, x, y, 0, width, height);
}
/**