From 27c93456b58343162f7c4ad20ca6bea0c9a91646 Mon Sep 17 00:00:00 2001 From: Jonathan Gray Date: Wed, 26 Aug 2020 05:30:39 +0000 Subject: Import Mesa 20.1.6 --- lib/mesa/src/gallium/drivers/r300/r300_fs.c | 2 +- lib/mesa/src/gallium/drivers/r300/r300_hyperz.c | 2 +- lib/mesa/src/gallium/drivers/r300/r300_state_derived.c | 4 ++-- lib/mesa/src/gallium/drivers/r300/r300_state_inlines.h | 2 +- lib/mesa/src/gallium/drivers/r300/r300_texture_desc.c | 2 +- lib/mesa/src/gallium/drivers/r300/r300_transfer.c | 2 +- 6 files changed, 7 insertions(+), 7 deletions(-) (limited to 'lib/mesa/src/gallium/drivers/r300') diff --git a/lib/mesa/src/gallium/drivers/r300/r300_fs.c b/lib/mesa/src/gallium/drivers/r300/r300_fs.c index 7d76c06ed..ffb041e24 100644 --- a/lib/mesa/src/gallium/drivers/r300/r300_fs.c +++ b/lib/mesa/src/gallium/drivers/r300/r300_fs.c @@ -22,7 +22,7 @@ * OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE * USE OR OTHER DEALINGS IN THE SOFTWARE. */ -#include "util/u_format.h" +#include "util/format/u_format.h" #include "util/u_math.h" #include "util/u_memory.h" diff --git a/lib/mesa/src/gallium/drivers/r300/r300_hyperz.c b/lib/mesa/src/gallium/drivers/r300/r300_hyperz.c index d86819afa..6e85ae43c 100644 --- a/lib/mesa/src/gallium/drivers/r300/r300_hyperz.c +++ b/lib/mesa/src/gallium/drivers/r300/r300_hyperz.c @@ -25,7 +25,7 @@ #include "r300_reg.h" #include "r300_fs.h" -#include "util/u_format.h" +#include "util/format/u_format.h" /* HiZ rules - taken from various docs diff --git a/lib/mesa/src/gallium/drivers/r300/r300_state_derived.c b/lib/mesa/src/gallium/drivers/r300/r300_state_derived.c index bae669e78..848bbd392 100644 --- a/lib/mesa/src/gallium/drivers/r300/r300_state_derived.c +++ b/lib/mesa/src/gallium/drivers/r300/r300_state_derived.c @@ -376,7 +376,7 @@ static void r300_update_rs_block(struct r300_context *r300) if (fs_inputs->color[i] != ATTR_UNUSED) { fp_offset++; - DBG(r300, DBG_RS, "r300: FS input color %i unassigned%s.\n", + DBG(r300, DBG_RS, "r300: FS input color %i unassigned.\n", i); } } @@ -474,7 +474,7 @@ static void r300_update_rs_block(struct r300_context *r300) if (fs_inputs->generic[i] != ATTR_UNUSED) { fp_offset++; - DBG(r300, DBG_RS, "r300: FS input generic %i unassigned%s.\n", i); + DBG(r300, DBG_RS, "r300: FS input generic %i unassigned.\n", i); } } } diff --git a/lib/mesa/src/gallium/drivers/r300/r300_state_inlines.h b/lib/mesa/src/gallium/drivers/r300/r300_state_inlines.h index fbd91cda9..219c3073f 100644 --- a/lib/mesa/src/gallium/drivers/r300/r300_state_inlines.h +++ b/lib/mesa/src/gallium/drivers/r300/r300_state_inlines.h @@ -26,7 +26,7 @@ #include "draw/draw_vertex.h" #include "pipe/p_format.h" -#include "util/u_format.h" +#include "util/format/u_format.h" #include "r300_reg.h" #include diff --git a/lib/mesa/src/gallium/drivers/r300/r300_texture_desc.c b/lib/mesa/src/gallium/drivers/r300/r300_texture_desc.c index 37e7b5fc4..5da35fba7 100644 --- a/lib/mesa/src/gallium/drivers/r300/r300_texture_desc.c +++ b/lib/mesa/src/gallium/drivers/r300/r300_texture_desc.c @@ -24,7 +24,7 @@ #include "r300_texture_desc.h" #include "r300_context.h" -#include "util/u_format.h" +#include "util/format/u_format.h" #include /* Returns the number of pixels that the texture should be aligned to diff --git a/lib/mesa/src/gallium/drivers/r300/r300_transfer.c b/lib/mesa/src/gallium/drivers/r300/r300_transfer.c index 9d00f4d93..95cea7265 100644 --- a/lib/mesa/src/gallium/drivers/r300/r300_transfer.c +++ b/lib/mesa/src/gallium/drivers/r300/r300_transfer.c @@ -26,7 +26,7 @@ #include "r300_screen_buffer.h" #include "util/u_memory.h" -#include "util/u_format.h" +#include "util/format/u_format.h" #include "util/u_box.h" struct r300_transfer { -- cgit v1.2.3