From 0c4bc1e29223ffec4617999c0c03d722bdcc170a Mon Sep 17 00:00:00 2001 From: Marek Olšák Date: Thu, 2 Oct 2014 16:36:51 +0200 Subject: tgsi: change tgsi_shader_info::properties to a one-dimensional array Reviewed-by: Roland Scheidegger v2: fix svga too --- src/gallium/drivers/softpipe/sp_quad_blend.c | 2 +- src/gallium/drivers/softpipe/sp_setup.c | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) (limited to 'src/gallium/drivers/softpipe') diff --git a/src/gallium/drivers/softpipe/sp_quad_blend.c b/src/gallium/drivers/softpipe/sp_quad_blend.c index d60e5087ac0..a32bd7fd241 100644 --- a/src/gallium/drivers/softpipe/sp_quad_blend.c +++ b/src/gallium/drivers/softpipe/sp_quad_blend.c @@ -924,7 +924,7 @@ blend_fallback(struct quad_stage *qs, const struct pipe_blend_state *blend = softpipe->blend; unsigned cbuf; boolean write_all = - softpipe->fs_variant->info.properties[TGSI_PROPERTY_FS_COLOR0_WRITES_ALL_CBUFS][0]; + softpipe->fs_variant->info.properties[TGSI_PROPERTY_FS_COLOR0_WRITES_ALL_CBUFS]; for (cbuf = 0; cbuf < softpipe->framebuffer.nr_cbufs; cbuf++) { if (softpipe->framebuffer.cbufs[cbuf]) { diff --git a/src/gallium/drivers/softpipe/sp_setup.c b/src/gallium/drivers/softpipe/sp_setup.c index 989ed9c601b..6704015112b 100644 --- a/src/gallium/drivers/softpipe/sp_setup.c +++ b/src/gallium/drivers/softpipe/sp_setup.c @@ -563,9 +563,9 @@ setup_fragcoord_coeff(struct setup_context *setup, uint slot) { const struct tgsi_shader_info *fsInfo = &setup->softpipe->fs_variant->info; boolean origin_lower_left = - fsInfo->properties[TGSI_PROPERTY_FS_COORD_ORIGIN][0]; + fsInfo->properties[TGSI_PROPERTY_FS_COORD_ORIGIN]; boolean pixel_center_integer = - fsInfo->properties[TGSI_PROPERTY_FS_COORD_PIXEL_CENTER][0]; + fsInfo->properties[TGSI_PROPERTY_FS_COORD_PIXEL_CENTER]; /*X*/ setup->coef[slot].a0[0] = pixel_center_integer ? 0.0f : 0.5f; -- cgit v1.2.3