diff options
author | marha <marha@users.sourceforge.net> | 2013-07-16 08:53:23 +0200 |
---|---|---|
committer | marha <marha@users.sourceforge.net> | 2013-07-16 08:53:23 +0200 |
commit | 06f4de23ace4de1fd628c37891214f0a4ecb77db (patch) | |
tree | 38ba52b20ef6060eab6e9b91e2c022e7a953e06b /mesalib/src/mesa/main/mtypes.h | |
parent | ffce4319c2fb6f4f663cc5a9660e1d5837fcde87 (diff) | |
download | vcxsrv-06f4de23ace4de1fd628c37891214f0a4ecb77db.tar.gz vcxsrv-06f4de23ace4de1fd628c37891214f0a4ecb77db.tar.bz2 vcxsrv-06f4de23ace4de1fd628c37891214f0a4ecb77db.zip |
libxcb xcb-proto mesa xkbcomp git update 16 Jul 2013
libxcb commit 45619dc71e9411a526d7c69595cf615b1b1206cf
libxcb/xcb-proto commit 56a82005ac388fcb7a4d1c82e07c7e72eaf69a32
xkbcomp commit 1cd5c50c54b06de2238d6d7675d0a3c65a21414d
mesa commit e4fdf1b008ce29c5b5a52985c586b61f35d31e4c
Diffstat (limited to 'mesalib/src/mesa/main/mtypes.h')
-rw-r--r-- | mesalib/src/mesa/main/mtypes.h | 32 |
1 files changed, 19 insertions, 13 deletions
diff --git a/mesalib/src/mesa/main/mtypes.h b/mesalib/src/mesa/main/mtypes.h index 2f7cce7ba..ea139ea58 100644 --- a/mesalib/src/mesa/main/mtypes.h +++ b/mesalib/src/mesa/main/mtypes.h @@ -272,8 +272,6 @@ typedef enum /*@}*/ -/*********************************************/ - /** * Determine if the given gl_varying_slot appears in the fragment shader. */ @@ -673,7 +671,7 @@ struct gl_colorbuffer_attrib GLboolean _ClampFragmentColor; /** < with GL_FIXED_ONLY_ARB resolved */ GLenum ClampReadColor; /**< GL_TRUE, GL_FALSE or GL_FIXED_ONLY_ARB */ - GLboolean sRGBEnabled; /**< Framebuffer sRGB blending/updating requested */ + GLboolean sRGBEnabled; /**< Framebuffer sRGB blending/updating requested */ }; @@ -874,9 +872,8 @@ struct gl_multisample_attrib /* ARB_texture_multisample / GL3.2 additions */ GLboolean SampleMask; - GLbitfield SampleMaskValue; /* GL spec defines this as an array but >32x MSAA is - * madness - */ + /** The GL spec defines this as an array but >32x MSAA is madness */ + GLbitfield SampleMaskValue; }; @@ -1103,8 +1100,8 @@ struct gl_texture_image GLuint Face; /** GL_ARB_texture_multisample */ - GLuint NumSamples; /**< Sample count, or 0 for non-multisample */ - GLboolean FixedSampleLocations; /**< Same sample locations for all pixels? */ + GLuint NumSamples; /**< Sample count, or 0 for non-multisample */ + GLboolean FixedSampleLocations; /**< Same sample locations for all pixels? */ }; @@ -1546,7 +1543,8 @@ struct gl_array_attrib /** * Vertex arrays as consumed by a driver. - * The array pointer is set up only by the VBO module. */ + * The array pointer is set up only by the VBO module. + */ const struct gl_client_array **_DrawArrays; /**< 0..VERT_ATTRIB_MAX-1 */ }; @@ -2102,7 +2100,10 @@ struct gl_sl_pragmas */ struct gl_shader { - GLenum Type; /**< GL_FRAGMENT_SHADER || GL_VERTEX_SHADER || GL_GEOMETRY_SHADER_ARB (first field!) */ + /** GL_FRAGMENT_SHADER || GL_VERTEX_SHADER || GL_GEOMETRY_SHADER_ARB. + * Must be the first field. + */ + GLenum Type; GLuint Name; /**< AKA the handle */ GLint RefCount; /**< Reference count */ GLboolean DeletePending; @@ -2186,6 +2187,7 @@ typedef enum MESA_SHADER_TYPES = 3 } gl_shader_type; + struct gl_uniform_buffer_variable { char *Name; @@ -2207,12 +2209,15 @@ struct gl_uniform_buffer_variable GLboolean RowMajor; }; -enum gl_uniform_block_packing { + +enum gl_uniform_block_packing +{ ubo_packing_std140, ubo_packing_shared, ubo_packing_packed }; + struct gl_uniform_block { /** Declared name of the uniform block */ @@ -2244,6 +2249,7 @@ struct gl_uniform_block enum gl_uniform_block_packing _Packing; }; + /** * A GLSL program object. * Basically a linked collection of vertex and fragment shaders. @@ -2793,7 +2799,7 @@ struct gl_constants GLuint MaxTextureRectSize; /**< Max rectangle texture size, in pixes */ GLuint MaxTextureCoordUnits; GLuint MaxCombinedTextureImageUnits; - GLuint MaxTextureUnits; /**< = MIN(CoordUnits, FragmentProgram.ImageUnits) */ + GLuint MaxTextureUnits; /**< = MIN(CoordUnits, FragmentProgram.ImageUnits) */ GLfloat MaxTextureMaxAnisotropy; /**< GL_EXT_texture_filter_anisotropic */ GLfloat MaxTextureLodBias; /**< GL_EXT_texture_lod_bias */ GLuint MaxTextureBufferSize; /**< GL_ARB_texture_buffer_object */ @@ -3324,7 +3330,7 @@ struct gl_debug_namespace struct gl_debug_state { GLDEBUGPROCARB Callback; - GLvoid *CallbackData; + const void *CallbackData; GLboolean SyncOutput; GLboolean Defaults[MESA_DEBUG_SEVERITY_COUNT][MESA_DEBUG_SOURCE_COUNT][MESA_DEBUG_TYPE_COUNT]; struct gl_debug_namespace Namespaces[MESA_DEBUG_SOURCE_COUNT][MESA_DEBUG_TYPE_COUNT]; |