projects
/
mesa.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
softpipe: fix depth sampling for linear vs nearest.
[mesa.git]
/
src
/
gallium
/
drivers
/
galahad
/
glhd_context.c
diff --git
a/src/gallium/drivers/galahad/glhd_context.c
b/src/gallium/drivers/galahad/glhd_context.c
index 1dc652c6bd9de1fa9ad6fba26a24e8dcb8014f29..a4afa813f898dd25820b1962ae53835d8fcb58ad 100644
(file)
--- a/
src/gallium/drivers/galahad/glhd_context.c
+++ b/
src/gallium/drivers/galahad/glhd_context.c
@@
-685,6
+685,12
@@
galahad_resource_copy_region(struct pipe_context *_pipe,
util_format_short_name(_dst->format));
}
util_format_short_name(_dst->format));
}
+ if ((_src->target == PIPE_BUFFER && _dst->target != PIPE_BUFFER) ||
+ (_src->target != PIPE_BUFFER && _dst->target == PIPE_BUFFER)) {
+ glhd_warn("Resource target mismatch: Source is %i, destination is %i",
+ _src->target, _dst->target);
+ }
+
pipe->resource_copy_region(pipe,
dst,
dst_level,
pipe->resource_copy_region(pipe,
dst,
dst_level,
@@
-699,7
+705,7
@@
galahad_resource_copy_region(struct pipe_context *_pipe,
static void
galahad_clear(struct pipe_context *_pipe,
unsigned buffers,
static void
galahad_clear(struct pipe_context *_pipe,
unsigned buffers,
- const
float *rgba
,
+ const
union pipe_color_union *color
,
double depth,
unsigned stencil)
{
double depth,
unsigned stencil)
{
@@
-708,7
+714,7
@@
galahad_clear(struct pipe_context *_pipe,
pipe->clear(pipe,
buffers,
pipe->clear(pipe,
buffers,
-
rgba
,
+
color
,
depth,
stencil);
}
depth,
stencil);
}
@@
-716,7
+722,7
@@
galahad_clear(struct pipe_context *_pipe,
static void
galahad_clear_render_target(struct pipe_context *_pipe,
struct pipe_surface *_dst,
static void
galahad_clear_render_target(struct pipe_context *_pipe,
struct pipe_surface *_dst,
- const
float *rgba
,
+ const
union pipe_color_union *color
,
unsigned dstx, unsigned dsty,
unsigned width, unsigned height)
{
unsigned dstx, unsigned dsty,
unsigned width, unsigned height)
{
@@
-727,7
+733,7
@@
galahad_clear_render_target(struct pipe_context *_pipe,
pipe->clear_render_target(pipe,
dst,
pipe->clear_render_target(pipe,
dst,
-
rgba
,
+
color
,
dstx,
dsty,
width,
dstx,
dsty,
width,
@@
-761,14
+767,12
@@
galahad_clear_depth_stencil(struct pipe_context *_pipe,
static void
galahad_flush(struct pipe_context *_pipe,
static void
galahad_flush(struct pipe_context *_pipe,
- unsigned flags,
struct pipe_fence_handle **fence)
{
struct galahad_context *glhd_pipe = galahad_context(_pipe);
struct pipe_context *pipe = glhd_pipe->pipe;
pipe->flush(pipe,
struct pipe_fence_handle **fence)
{
struct galahad_context *glhd_pipe = galahad_context(_pipe);
struct pipe_context *pipe = glhd_pipe->pipe;
pipe->flush(pipe,
- flags,
fence);
}
fence);
}