Commit: 45103e3a88cac0c50784dbc11da31b5e06211f43 Author: Miguel Pozo Date: Tue Dec 20 17:12:43 2022 +0100 Branches: tmp-workbench-rewrite2 https://developer.blender.org/rB45103e3a88cac0c50784dbc11da31b5e06211f43
Merge branch 'master' into tmp-workbench-rewrite2 =================================================================== =================================================================== diff --cc source/blender/gpu/intern/gpu_texture_private.hh index aad56639859,fc5e39a3534..20543391691 --- a/source/blender/gpu/intern/gpu_texture_private.hh +++ b/source/blender/gpu/intern/gpu_texture_private.hh @@@ -41,8 -41,21 +41,21 @@@ typedef enum eGPUTextureType GPU_TEXTURE_CUBE_ARRAY = (GPU_TEXTURE_CUBE | GPU_TEXTURE_ARRAY), } eGPUTextureType; -ENUM_OPERATORS(eGPUTextureType, GPU_TEXTURE_CUBE_ARRAY) +ENUM_OPERATORS(eGPUTextureType, GPU_TEXTURE_BUFFER) + /* Format types for samplers within the shader. + * This covers the sampler format type permutations within GLSL/MSL.*/ + typedef enum eGPUSamplerFormat { + GPU_SAMPLER_TYPE_FLOAT = 0, + GPU_SAMPLER_TYPE_INT = 1, + GPU_SAMPLER_TYPE_UINT = 2, + /* Special case for depth, as these require differing dummy formats. */ + GPU_SAMPLER_TYPE_DEPTH = 3, + GPU_SAMPLER_TYPE_MAX = 4 + } eGPUSamplerFormat; + + ENUM_OPERATORS(eGPUSamplerFormat, GPU_SAMPLER_TYPE_UINT) + #ifdef DEBUG # define DEBUG_NAME_LEN 64 #else _______________________________________________ Bf-blender-cvs mailing list Bf-blender-cvs@blender.org List details, subscription details or unsubscribe: https://lists.blender.org/mailman/listinfo/bf-blender-cvs