Mesa (master): nir: don't use GLenum16 in nir.h
GitLab Mirror
gitlab-mirror at kemper.freedesktop.org
Tue Nov 19 23:22:00 UTC 2019
Module: Mesa
Branch: master
Commit: 654efd38bb49daa0040ffbc6b046a6d3ba4cdb4f
URL: http://cgit.freedesktop.org/mesa/mesa/commit/?id=654efd38bb49daa0040ffbc6b046a6d3ba4cdb4f
Author: Marek Olšák <marek.olsak at amd.com>
Date: Mon Nov 11 20:03:40 2019 -0500
nir: don't use GLenum16 in nir.h
Reviewed-by: Connor Abbott <cwabbott0 at gmail.com>
---
src/compiler/nir/nir.h | 3 +--
1 file changed, 1 insertion(+), 2 deletions(-)
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 {
More information about the mesa-commit
mailing list