From 2e4f1b592f7d1b63ec012528997fab64f16c0416 Mon Sep 17 00:00:00 2001 From: Campbell Barton Date: Wed, 23 Jan 2019 14:15:43 +1100 Subject: Cleanup: use eGPU prefix for GPU enum types --- source/blender/draw/intern/draw_manager_texture.c | 18 +++++++++--------- 1 file changed, 9 insertions(+), 9 deletions(-) (limited to 'source/blender/draw/intern/draw_manager_texture.c') diff --git a/source/blender/draw/intern/draw_manager_texture.c b/source/blender/draw/intern/draw_manager_texture.c index 6976b65d6d4..9d70a35d1a4 100644 --- a/source/blender/draw/intern/draw_manager_texture.c +++ b/source/blender/draw/intern/draw_manager_texture.c @@ -30,7 +30,7 @@ #ifndef NDEBUG /* Maybe gpu_texture.c is a better place for this. */ -static bool drw_texture_format_supports_framebuffer(GPUTextureFormat format) +static bool drw_texture_format_supports_framebuffer(eGPUTextureFormat format) { /* Some formats do not work with framebuffers. */ switch (format) { @@ -79,7 +79,7 @@ void drw_texture_set_parameters(GPUTexture *tex, DRWTextureFlag flags) GPU_texture_unbind(tex); } -GPUTexture *DRW_texture_create_1D(int w, GPUTextureFormat format, DRWTextureFlag flags, const float *fpixels) +GPUTexture *DRW_texture_create_1D(int w, eGPUTextureFormat format, DRWTextureFlag flags, const float *fpixels) { GPUTexture *tex = GPU_texture_create_1D(w, format, fpixels, NULL); drw_texture_set_parameters(tex, flags); @@ -87,7 +87,7 @@ GPUTexture *DRW_texture_create_1D(int w, GPUTextureFormat format, DRWTextureFlag return tex; } -GPUTexture *DRW_texture_create_2D(int w, int h, GPUTextureFormat format, DRWTextureFlag flags, const float *fpixels) +GPUTexture *DRW_texture_create_2D(int w, int h, eGPUTextureFormat format, DRWTextureFlag flags, const float *fpixels) { GPUTexture *tex = GPU_texture_create_2D(w, h, format, fpixels, NULL); drw_texture_set_parameters(tex, flags); @@ -96,7 +96,7 @@ GPUTexture *DRW_texture_create_2D(int w, int h, GPUTextureFormat format, DRWText } GPUTexture *DRW_texture_create_2D_array( - int w, int h, int d, GPUTextureFormat format, DRWTextureFlag flags, const float *fpixels) + int w, int h, int d, eGPUTextureFormat format, DRWTextureFlag flags, const float *fpixels) { GPUTexture *tex = GPU_texture_create_2D_array(w, h, d, format, fpixels, NULL); drw_texture_set_parameters(tex, flags); @@ -105,7 +105,7 @@ GPUTexture *DRW_texture_create_2D_array( } GPUTexture *DRW_texture_create_3D( - int w, int h, int d, GPUTextureFormat format, DRWTextureFlag flags, const float *fpixels) + int w, int h, int d, eGPUTextureFormat format, DRWTextureFlag flags, const float *fpixels) { GPUTexture *tex = GPU_texture_create_3D(w, h, d, format, fpixels, NULL); drw_texture_set_parameters(tex, flags); @@ -113,7 +113,7 @@ GPUTexture *DRW_texture_create_3D( return tex; } -GPUTexture *DRW_texture_create_cube(int w, GPUTextureFormat format, DRWTextureFlag flags, const float *fpixels) +GPUTexture *DRW_texture_create_cube(int w, eGPUTextureFormat format, DRWTextureFlag flags, const float *fpixels) { GPUTexture *tex = GPU_texture_create_cube(w, format, fpixels, NULL); drw_texture_set_parameters(tex, flags); @@ -121,7 +121,7 @@ GPUTexture *DRW_texture_create_cube(int w, GPUTextureFormat format, DRWTextureFl return tex; } -GPUTexture *DRW_texture_pool_query_2D(int w, int h, GPUTextureFormat format, DrawEngineType *engine_type) +GPUTexture *DRW_texture_pool_query_2D(int w, int h, eGPUTextureFormat format, DrawEngineType *engine_type) { BLI_assert(drw_texture_format_supports_framebuffer(format)); GPUTexture *tex = GPU_viewport_texture_pool_query(DST.viewport, engine_type, w, h, format); @@ -129,7 +129,7 @@ GPUTexture *DRW_texture_pool_query_2D(int w, int h, GPUTextureFormat format, Dra return tex; } -void DRW_texture_ensure_fullscreen_2D(GPUTexture **tex, GPUTextureFormat format, DRWTextureFlag flags) +void DRW_texture_ensure_fullscreen_2D(GPUTexture **tex, eGPUTextureFormat format, DRWTextureFlag flags) { if (*(tex) == NULL) { const float *size = DRW_viewport_size_get(); @@ -137,7 +137,7 @@ void DRW_texture_ensure_fullscreen_2D(GPUTexture **tex, GPUTextureFormat format, } } -void DRW_texture_ensure_2D(GPUTexture **tex, int w, int h, GPUTextureFormat format, DRWTextureFlag flags) +void DRW_texture_ensure_2D(GPUTexture **tex, int w, int h, eGPUTextureFormat format, DRWTextureFlag flags) { if (*(tex) == NULL) { *(tex) = DRW_texture_create_2D(w, h, format, flags, NULL); -- cgit v1.2.3