diff options
Diffstat (limited to 'source/blender/gpu/intern/gpu_texture_private.hh')
-rw-r--r-- | source/blender/gpu/intern/gpu_texture_private.hh | 18 |
1 files changed, 9 insertions, 9 deletions
diff --git a/source/blender/gpu/intern/gpu_texture_private.hh b/source/blender/gpu/intern/gpu_texture_private.hh index 51a953e110d..e03d5f6e6ce 100644 --- a/source/blender/gpu/intern/gpu_texture_private.hh +++ b/source/blender/gpu/intern/gpu_texture_private.hh @@ -387,13 +387,13 @@ inline int to_component_len(eGPUTextureFormat format) inline size_t to_bytesize(eGPUDataFormat data_format) { switch (data_format) { - case GPU_DATA_UNSIGNED_BYTE: + case GPU_DATA_UBYTE: return 1; case GPU_DATA_FLOAT: case GPU_DATA_INT: - case GPU_DATA_UNSIGNED_INT: + case GPU_DATA_UINT: return 4; - case GPU_DATA_UNSIGNED_INT_24_8: + case GPU_DATA_UINT_24_8: case GPU_DATA_10_11_11_REV: return 4; default: @@ -417,12 +417,12 @@ inline bool validate_data_format(eGPUTextureFormat tex_format, eGPUDataFormat da return data_format == GPU_DATA_FLOAT; case GPU_DEPTH24_STENCIL8: case GPU_DEPTH32F_STENCIL8: - return data_format == GPU_DATA_UNSIGNED_INT_24_8; + return data_format == GPU_DATA_UINT_24_8; case GPU_R8UI: case GPU_R16UI: case GPU_RG16UI: case GPU_R32UI: - return data_format == GPU_DATA_UNSIGNED_INT; + return data_format == GPU_DATA_UINT; case GPU_RG16I: case GPU_R16I: return data_format == GPU_DATA_INT; @@ -431,7 +431,7 @@ inline bool validate_data_format(eGPUTextureFormat tex_format, eGPUDataFormat da case GPU_RGBA8: case GPU_RGBA8UI: case GPU_SRGB8_A8: - return ELEM(data_format, GPU_DATA_UNSIGNED_BYTE, GPU_DATA_FLOAT); + return ELEM(data_format, GPU_DATA_UBYTE, GPU_DATA_FLOAT); case GPU_R11F_G11F_B10F: return ELEM(data_format, GPU_DATA_10_11_11_REV, GPU_DATA_FLOAT); default: @@ -449,12 +449,12 @@ inline eGPUDataFormat to_data_format(eGPUTextureFormat tex_format) return GPU_DATA_FLOAT; case GPU_DEPTH24_STENCIL8: case GPU_DEPTH32F_STENCIL8: - return GPU_DATA_UNSIGNED_INT_24_8; + return GPU_DATA_UINT_24_8; case GPU_R8UI: case GPU_R16UI: case GPU_RG16UI: case GPU_R32UI: - return GPU_DATA_UNSIGNED_INT; + return GPU_DATA_UINT; case GPU_RG16I: case GPU_R16I: return GPU_DATA_INT; @@ -463,7 +463,7 @@ inline eGPUDataFormat to_data_format(eGPUTextureFormat tex_format) case GPU_RGBA8: case GPU_RGBA8UI: case GPU_SRGB8_A8: - return GPU_DATA_UNSIGNED_BYTE; + return GPU_DATA_UBYTE; case GPU_R11F_G11F_B10F: return GPU_DATA_10_11_11_REV; default: |