From: Marek Olšák <marek.olsak@amd.com>
Date: Tue, 12 Nov 2019 01:03:40 +0000 (-0500)
Subject: nir: don't use GLenum16 in nir.h
X-Git-Url: https://git.libre-soc.org/?a=commitdiff_plain;h=654efd38bb49daa0040ffbc6b046a6d3ba4cdb4f;p=mesa.git

nir: don't use GLenum16 in nir.h

Reviewed-by: Connor Abbott <cwabbott0@gmail.com>
---

diff --git a/src/compiler/nir/nir.h b/src/compiler/nir/nir.h
index 29ef2ce0d7d..9bd1d321e03 100644
--- a/src/compiler/nir/nir.h
+++ b/src/compiler/nir/nir.h
@@ -62,7 +62,6 @@ extern "C" {
 #define NIR_MAX_MATRIX_COLUMNS 4
 #define NIR_STREAM_PACKED (1 << 8)
 typedef uint8_t nir_component_mask_t;
-typedef unsigned short GLenum16;
 
 /** Defines a cast function
  *
@@ -488,7 +487,7 @@ typedef struct nir_variable {
       union {
          struct {
             /** Image internal format if specified explicitly, otherwise GL_NONE. */
-            GLenum16 format;
+            uint16_t format; /* GLenum */
          } image;
 
          struct {