From: Bruce Cherniak <bruce.cherniak@intel.com>
Date: Thu, 29 Jun 2017 19:41:31 +0000 (-0500)
Subject: swr: Minor cleanup of variable usage, no functional change.
X-Git-Url: https://git.libre-soc.org/?a=commitdiff_plain;h=6646f6ba0dca70478cafd39886005e387406f114;p=mesa.git

swr: Minor cleanup of variable usage, no functional change.

In swr_update_derived, for consistency, index buffer validation should
be using the p_draw_info copy "info" rather than referencing
p_draw_info.

No functional change.

Reviewed-by: Tim Rowley <timothy.o.rowley@intel.com>
---

diff --git a/src/gallium/drivers/swr/swr_state.cpp b/src/gallium/drivers/swr/swr_state.cpp
index 897ce998fff..45c9c213e5b 100644
--- a/src/gallium/drivers/swr/swr_state.cpp
+++ b/src/gallium/drivers/swr/swr_state.cpp
@@ -1294,7 +1294,7 @@ swr_update_derived(struct pipe_context *pipe,
          const uint8_t *p_data;
          uint32_t size, pitch;
 
-         pitch = p_draw_info->index_size ? p_draw_info->index_size : sizeof(uint32_t);
+         pitch = info.index_size ? info.index_size : sizeof(uint32_t);
          index_type = swr_convert_index_type(pitch);
 
          if (!info.has_user_indices) {
@@ -1320,7 +1320,7 @@ swr_update_derived(struct pipe_context *pipe,
          }
 
          SWR_INDEX_BUFFER_STATE swrIndexBuffer;
-         swrIndexBuffer.format = swr_convert_index_type(p_draw_info->index_size);
+         swrIndexBuffer.format = swr_convert_index_type(info.index_size);
          swrIndexBuffer.pIndices = p_data;
          swrIndexBuffer.size = size;