diff options
| author | Jonathan Gray <jsg@cvs.openbsd.org> | 2020-08-26 05:30:39 +0000 |
|---|---|---|
| committer | Jonathan Gray <jsg@cvs.openbsd.org> | 2020-08-26 05:30:39 +0000 |
| commit | 27c93456b58343162f7c4ad20ca6bea0c9a91646 (patch) | |
| tree | 945c20b63e0b9975ee40f114c5312f8d8f1a2d0b /lib/mesa/src/gallium/drivers/i915 | |
| parent | 875b83a3ee95e248388fbf72271acc80f6f97987 (diff) | |
Import Mesa 20.1.6
Diffstat (limited to 'lib/mesa/src/gallium/drivers/i915')
5 files changed, 7 insertions, 5 deletions
diff --git a/lib/mesa/src/gallium/drivers/i915/TODO b/lib/mesa/src/gallium/drivers/i915/TODO index b86933463..20c082062 100644 --- a/lib/mesa/src/gallium/drivers/i915/TODO +++ b/lib/mesa/src/gallium/drivers/i915/TODO @@ -35,4 +35,4 @@ Random list of problems with i915g: - Fix fragment discard Other bugs can be found here: -https://gitlab.freedesktop.org/mesa/mesa/issues?scope=all&utf8=%E2%9C%93&state=opened&label_name[]=i915g +https://gitlab.freedesktop.org/mesa/mesa/-/issues?scope=all&utf8=%E2%9C%93&state=opened&label_name[]=i915g diff --git a/lib/mesa/src/gallium/drivers/i915/i915_clear.c b/lib/mesa/src/gallium/drivers/i915/i915_clear.c index a1af78910..56281c23f 100644 --- a/lib/mesa/src/gallium/drivers/i915/i915_clear.c +++ b/lib/mesa/src/gallium/drivers/i915/i915_clear.c @@ -30,7 +30,7 @@ */ -#include "util/u_format.h" +#include "util/format/u_format.h" #include "util/u_pack_color.h" #include "i915_context.h" #include "i915_screen.h" @@ -217,6 +217,7 @@ i915_clear_emit(struct pipe_context *pipe, unsigned buffers, */ void i915_clear_blitter(struct pipe_context *pipe, unsigned buffers, + const struct pipe_scissor_state *scissor_state, const union pipe_color_union *color, double depth, unsigned stencil) { @@ -245,6 +246,7 @@ i915_clear_blitter(struct pipe_context *pipe, unsigned buffers, void i915_clear_render(struct pipe_context *pipe, unsigned buffers, + const struct pipe_scissor_state *scissor_state, const union pipe_color_union *color, double depth, unsigned stencil) { diff --git a/lib/mesa/src/gallium/drivers/i915/i915_debug.h b/lib/mesa/src/gallium/drivers/i915/i915_debug.h index 0f12a592a..66290a84b 100644 --- a/lib/mesa/src/gallium/drivers/i915/i915_debug.h +++ b/lib/mesa/src/gallium/drivers/i915/i915_debug.h @@ -48,7 +48,7 @@ struct i915_winsys_batchbuffer; extern unsigned i915_debug; #ifdef DEBUG -static inline boolean +static inline bool I915_DBG_ON(unsigned flags) { return i915_debug & flags; diff --git a/lib/mesa/src/gallium/drivers/i915/i915_resource_texture.c b/lib/mesa/src/gallium/drivers/i915/i915_resource_texture.c index 0521f2c4e..e16d2ac2f 100644 --- a/lib/mesa/src/gallium/drivers/i915/i915_resource_texture.c +++ b/lib/mesa/src/gallium/drivers/i915/i915_resource_texture.c @@ -34,7 +34,7 @@ #include "pipe/p_context.h" #include "pipe/p_defines.h" #include "util/u_inlines.h" -#include "util/u_format.h" +#include "util/format/u_format.h" #include "util/u_math.h" #include "util/u_memory.h" #include "util/u_rect.h" diff --git a/lib/mesa/src/gallium/drivers/i915/i915_state_emit.c b/lib/mesa/src/gallium/drivers/i915/i915_state_emit.c index a407020f6..9f0f9e33c 100644 --- a/lib/mesa/src/gallium/drivers/i915/i915_state_emit.c +++ b/lib/mesa/src/gallium/drivers/i915/i915_state_emit.c @@ -37,7 +37,7 @@ #include "pipe/p_defines.h" #include "pipe/p_format.h" -#include "util/u_format.h" +#include "util/format/u_format.h" #include "util/u_math.h" #include "util/u_memory.h" |