From: Kenneth Graunke <kenneth@whitecape.org>
Date: Thu, 4 May 2017 08:08:25 +0000 (-0700)
Subject: mesa: Simplify _mesa_primitive_restart_index().
X-Git-Url: https://git.libre-soc.org/?a=commitdiff_plain;h=8c5a938171d0566b087fdfb5c422464aa005e8ed;p=mesa.git

mesa: Simplify _mesa_primitive_restart_index().

We can use a simple shift equation rather than a switch statement.

Reviewed-by: Rafael Antognolli <rafael.antognolli@intel.com>
Reviewed-by: Marek Olšák <marek.olsak@amd.com>
---

diff --git a/src/mesa/main/varray.c b/src/mesa/main/varray.c
index eda86ec6a82..9497090e88a 100644
--- a/src/mesa/main/varray.c
+++ b/src/mesa/main/varray.c
@@ -1959,16 +1959,8 @@ _mesa_primitive_restart_index(const struct gl_context *ctx,
     *  is used."
     */
    if (ctx->Array.PrimitiveRestartFixedIndex) {
-      switch (index_size) {
-      case 1:
-         return 0xff;
-      case 2:
-         return 0xffff;
-      case 4:
-         return 0xffffffff;
-      default:
-         assert(!"_mesa_primitive_restart_index: Invalid index size.");
-      }
+      /* 1 -> 0xff, 2 -> 0xffff, 4 -> 0xffffffff */
+      return 0xffffffffu >> 8 * (4 - index_size);
    }
 
    return ctx->Array.RestartIndex;