AlexIndustrial/mesa
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

mtypes: move bindless image/sampler objects to shader_types.h

Browse Source 
Acked-by: Pierre-Eric Pelloux-Prayer <pierre-eric.pelloux-prayer@amd.com>
Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/14437>
This commit is contained in:
Dave Airlie
2022-01-07 15:03:47 +10:00
committed by Marge Bot
parent 0506c99ccd
commit 79834f4def
2 changed files with 40 additions and 39 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/mesa/main/mtypes.h
-39
View File
@@ -1980,45 +1980,6 @@ struct gl_perf_query_state
};
/**
* A bindless sampler object.
*/
struct gl_bindless_sampler
{
/** Texture unit (set by glUniform1()). */
GLubyte unit;
/** Whether this bindless sampler is bound to a unit. */
GLboolean bound;
/** Texture Target (TEXTURE_1D/2D/3D/etc_INDEX). */
gl_texture_index target;
/** Pointer to the base of the data. */
GLvoid *data;
};
/**
* A bindless image object.
*/
struct gl_bindless_image
{
/** Image unit (set by glUniform1()). */
GLubyte unit;
/** Whether this bindless image is bound to a unit. */
GLboolean bound;
/** Access qualifier (GL_READ_WRITE, GL_READ_ONLY, GL_WRITE_ONLY, or
* GL_NONE to indicate both read-only and write-only)
*/
GLenum16 access;
/** Pointer to the base of the data. */
GLvoid *data;
};
/**
* State common to vertex and fragment programs.
*/
src/mesa/main/shader_types.h
+40
View File
@@ -33,6 +33,7 @@
#include "main/config.h" /* for MAX_FEEDBACK_BUFFERS */
#include "main/glheader.h"
#include "main/menums.h"
#include "util/mesa-sha1.h"
#include "compiler/shader_info.h"
#include "compiler/glsl/list.h"
@@ -874,4 +875,43 @@ struct gl_uniform_block
GLboolean _RowMajor;
};
/**
* A bindless sampler object.
*/
struct gl_bindless_sampler
{
/** Texture unit (set by glUniform1()). */
GLubyte unit;
/** Whether this bindless sampler is bound to a unit. */
GLboolean bound;
/** Texture Target (TEXTURE_1D/2D/3D/etc_INDEX). */
gl_texture_index target;
/** Pointer to the base of the data. */
GLvoid *data;
};
/**
* A bindless image object.
*/
struct gl_bindless_image
{
/** Image unit (set by glUniform1()). */
GLubyte unit;
/** Whether this bindless image is bound to a unit. */
GLboolean bound;
/** Access qualifier (GL_READ_WRITE, GL_READ_ONLY, GL_WRITE_ONLY, or
* GL_NONE to indicate both read-only and write-only)
*/
GLenum16 access;
/** Pointer to the base of the data. */
GLvoid *data;
};
#endif