OpenHarmony/third_party_mesa3d
2
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

rbug: fix breakage due to interface changes

Browse Source
This commit is contained in:
Roland Scheidegger
2010-05-21 20:52:01 +02:00
parent 3293bcdc80
commit e4f4489e3f
2 changed files with 54 additions and 40 deletions
Download Patch File Download Diff File Expand all files Collapse all files

92
src/gallium/drivers/rbug/rbug_context.c
View File

@@ -752,55 +752,67 @@ rbug_set_vertex_buffers(struct pipe_context *_pipe,
buffers); buffers);
} }
static void static void
rbug_surface_copy(struct pipe_context *_pipe, rbug_resource_copy_region(struct pipe_context *_pipe,
struct pipe_surface *_dst, struct pipe_resource *_dst,
unsigned dstx, struct pipe_subresource subdst,
unsigned dsty, unsigned dstx,
struct pipe_surface *_src, unsigned dsty,
unsigned srcx, unsigned dstz,
unsigned srcy, struct pipe_resource *_src,
unsigned width, struct pipe_subresource subsrc,
unsigned height) unsigned srcx,
unsigned srcy,
unsigned srcz,
unsigned width,
unsigned height)
{ {
struct rbug_context *rb_pipe = rbug_context(_pipe); struct rbug_context *rb_pipe = rbug_context(_pipe);
struct rbug_surface *rb_surface_dst = rbug_surface(_dst); struct rbug_resource *rb_resource_dst = rbug_resource(_dst);
struct rbug_surface *rb_surface_src = rbug_surface(_src); struct rbug_resource *rb_resource_src = rbug_resource(_src);
struct pipe_context *pipe = rb_pipe->pipe; struct pipe_context *pipe = rb_pipe->pipe;
struct pipe_surface *dst = rb_surface_dst->surface; struct pipe_resource *dst = rb_resource_dst->resource;
struct pipe_surface *src = rb_surface_src->surface; struct pipe_resource *src = rb_resource_src->resource;
pipe->surface_copy(pipe, pipe->resource_copy_region(pipe,
dst, dst,
dstx, subdst,
dsty, dstx,
src, dsty,
srcx, dstz,
srcy, src,
width, subsrc,
height); srcx,
srcy,
srcz,
width,
height);
} }
static void static void
rbug_surface_fill(struct pipe_context *_pipe, rbug_resource_fill_region(struct pipe_context *_pipe,
struct pipe_surface *_dst, struct pipe_resource *_dst,
unsigned dstx, struct pipe_subresource subdst,
unsigned dsty, unsigned dstx,
unsigned width, unsigned dsty,
unsigned height, unsigned dstz,
unsigned value) unsigned width,
unsigned height,
unsigned value)
{ {
struct rbug_context *rb_pipe = rbug_context(_pipe); struct rbug_context *rb_pipe = rbug_context(_pipe);
struct rbug_surface *rb_surface_dst = rbug_surface(_dst); struct rbug_resource *rb_resource_dst = rbug_resource(_dst);
struct pipe_context *pipe = rb_pipe->pipe; struct pipe_context *pipe = rb_pipe->pipe;
struct pipe_surface *dst = rb_surface_dst->surface; struct pipe_resource *dst = rb_resource_dst->resource;
pipe->surface_fill(pipe, pipe->resource_fill_region(pipe,
dst, dst,
dstx, subdst,
dsty, dstx,
width, dsty,
height, dstz,
value); width,
height,
value);
} }
static void static void
@@ -1050,8 +1062,8 @@ rbug_context_create(struct pipe_screen *_screen, struct pipe_context *pipe)
rb_pipe->base.set_fragment_sampler_views = rbug_set_fragment_sampler_views; rb_pipe->base.set_fragment_sampler_views = rbug_set_fragment_sampler_views;
rb_pipe->base.set_vertex_sampler_views = rbug_set_vertex_sampler_views; rb_pipe->base.set_vertex_sampler_views = rbug_set_vertex_sampler_views;
rb_pipe->base.set_vertex_buffers = rbug_set_vertex_buffers; rb_pipe->base.set_vertex_buffers = rbug_set_vertex_buffers;
rb_pipe->base.surface_copy = rbug_surface_copy; rb_pipe->base.resource_copy_region = rbug_resource_copy_region;
rb_pipe->base.surface_fill = rbug_surface_fill; rb_pipe->base.resource_fill_region = rbug_resource_fill_region;
rb_pipe->base.clear = rbug_clear; rb_pipe->base.clear = rbug_clear;
rb_pipe->base.flush = rbug_flush; rb_pipe->base.flush = rbug_flush;
rb_pipe->base.is_resource_referenced = rbug_is_resource_referenced; rb_pipe->base.is_resource_referenced = rbug_is_resource_referenced;

2
src/gallium/drivers/rbug/rbug_screen.c
View File

@@ -94,6 +94,7 @@ static boolean
rbug_screen_is_format_supported(struct pipe_screen *_screen, rbug_screen_is_format_supported(struct pipe_screen *_screen,
enum pipe_format format, enum pipe_format format,
enum pipe_texture_target target, enum pipe_texture_target target,
unsigned sample_count,
unsigned tex_usage, unsigned tex_usage,
unsigned geom_flags) unsigned geom_flags)
{ {
@@ -103,6 +104,7 @@ rbug_screen_is_format_supported(struct pipe_screen *_screen,
return screen->is_format_supported(screen, return screen->is_format_supported(screen,
format, format,
target, target,
sample_count,
tex_usage, tex_usage,
geom_flags); geom_flags);
} }