OpenHarmony/third_party_mesa3d
2
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

compiler: move TEXTURE_COORD/VERTEX_GENERIC_ATTRIB limits into shader_enums.h

Browse Source 
because they are used there.

Reviewed-by: Matt Turner <mattst88@gmail.com>
Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/9050>
This commit is contained in:
Marek Olšák
2021-02-07 19:57:09 -05:00
committed by Marge Bot
parent 4b69ae8e1e
commit e06cbff50e
2 changed files with 8 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
src/compiler/shader_enums.h
View File

@@ -166,6 +166,14 @@ typedef enum
const char *gl_vert_attrib_name(gl_vert_attrib attrib); const char *gl_vert_attrib_name(gl_vert_attrib attrib);
/**
* Max number of texture coordinate units. This mainly just applies to
* the fixed-function vertex code. This will be difficult to raise above
* eight because of various vertex attribute bitvectors.
*/
#define MAX_TEXTURE_COORD_UNITS 8
#define MAX_VERTEX_GENERIC_ATTRIBS 16
/** /**
* Symbolic constats to help iterating over * Symbolic constats to help iterating over
* specific blocks of vertex attributes. * specific blocks of vertex attributes.

8
src/mesa/main/config.h
View File

@@ -105,13 +105,6 @@
*/ */
#define MAX_ARRAY_TEXTURE_LAYERS 64 #define MAX_ARRAY_TEXTURE_LAYERS 64
/**
* Max number of texture coordinate units. This mainly just applies to
* the fixed-function vertex code. This will be difficult to raise above
* eight because of various vertex attribute bitvectors.
*/
#define MAX_TEXTURE_COORD_UNITS 8
/** /**
* Max number of texture image units. Also determines number of texture * Max number of texture image units. Also determines number of texture
* samplers in shaders. * samplers in shaders.
@@ -213,7 +206,6 @@
/** For GL_ARB_vertex_shader */ /** For GL_ARB_vertex_shader */
/*@{*/ /*@{*/
#define MAX_VERTEX_GENERIC_ATTRIBS 16
/* 6 is for vertex, hull, domain, geometry, fragment, and compute shader. */ /* 6 is for vertex, hull, domain, geometry, fragment, and compute shader. */
#define MAX_COMBINED_TEXTURE_IMAGE_UNITS (MAX_TEXTURE_IMAGE_UNITS * 6) #define MAX_COMBINED_TEXTURE_IMAGE_UNITS (MAX_TEXTURE_IMAGE_UNITS * 6)
/*@}*/ /*@}*/