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/engines/eevee/eevee_depth_of_field.c | 4 ++-- source/blender/draw/engines/eevee/eevee_effects.c | 2 +- source/blender/draw/engines/eevee/eevee_engine.c | 2 +- source/blender/draw/engines/eevee/eevee_lightprobes.c | 2 +- source/blender/draw/engines/eevee/eevee_lights.c | 2 +- source/blender/draw/engines/eevee/eevee_materials.c | 4 ++-- source/blender/draw/engines/eevee/eevee_screen_raytrace.c | 2 +- 7 files changed, 9 insertions(+), 9 deletions(-) (limited to 'source/blender/draw/engines/eevee') diff --git a/source/blender/draw/engines/eevee/eevee_depth_of_field.c b/source/blender/draw/engines/eevee/eevee_depth_of_field.c index 7cb6492a37c..7c66a32f5fa 100644 --- a/source/blender/draw/engines/eevee/eevee_depth_of_field.c +++ b/source/blender/draw/engines/eevee/eevee_depth_of_field.c @@ -114,7 +114,7 @@ int EEVEE_depth_of_field_init(EEVEE_ViewLayerData *UNUSED(sldata), EEVEE_Data *v int buffer_size[2] = {(int)viewport_size[0] / 2, (int)viewport_size[1] / 2}; - GPUTextureFormat down_format = DRW_state_draw_background() ? GPU_R11F_G11F_B10F : GPU_RGBA16F; + eGPUTextureFormat down_format = DRW_state_draw_background() ? GPU_R11F_G11F_B10F : GPU_RGBA16F; effects->dof_down_near = DRW_texture_pool_query_2D(buffer_size[0], buffer_size[1], down_format, &draw_engine_eevee_type); @@ -131,7 +131,7 @@ int EEVEE_depth_of_field_init(EEVEE_ViewLayerData *UNUSED(sldata), EEVEE_Data *v }); /* Go full 32bits for rendering and reduce the color artifacts. */ - GPUTextureFormat fb_format = DRW_state_is_image_render() ? GPU_RGBA32F : GPU_RGBA16F; + eGPUTextureFormat fb_format = DRW_state_is_image_render() ? GPU_RGBA32F : GPU_RGBA16F; effects->dof_blur = DRW_texture_pool_query_2D(buffer_size[0] * 2, buffer_size[1], fb_format, &draw_engine_eevee_type); diff --git a/source/blender/draw/engines/eevee/eevee_effects.c b/source/blender/draw/engines/eevee/eevee_effects.c index a707961da63..09f88fb3ee8 100644 --- a/source/blender/draw/engines/eevee/eevee_effects.c +++ b/source/blender/draw/engines/eevee/eevee_effects.c @@ -117,7 +117,7 @@ static void eevee_create_shader_downsample(void) } #define SETUP_BUFFER(tex, fb, fb_color) { \ - GPUTextureFormat format = (DRW_state_is_scene_render()) ? GPU_RGBA32F : GPU_RGBA16F; \ + eGPUTextureFormat format = (DRW_state_is_scene_render()) ? GPU_RGBA32F : GPU_RGBA16F; \ DRW_texture_ensure_fullscreen_2D(&tex, format, DRW_TEX_FILTER | DRW_TEX_MIPMAP); \ GPU_framebuffer_ensure_config(&fb, { \ GPU_ATTACHMENT_TEXTURE(dtxl->depth), \ diff --git a/source/blender/draw/engines/eevee/eevee_engine.c b/source/blender/draw/engines/eevee/eevee_engine.c index 483220fde9c..7f6f485644c 100644 --- a/source/blender/draw/engines/eevee/eevee_engine.c +++ b/source/blender/draw/engines/eevee/eevee_engine.c @@ -256,7 +256,7 @@ static void eevee_draw_background(void *vedata) DRW_uniformbuffer_update(sldata->common_ubo, &sldata->common_data); GPU_framebuffer_bind(fbl->main_fb); - GPUFrameBufferBits clear_bits = GPU_DEPTH_BIT; + eGPUFrameBufferBits clear_bits = GPU_DEPTH_BIT; clear_bits |= (DRW_state_draw_background()) ? 0 : GPU_COLOR_BIT; clear_bits |= ((stl->effects->enabled_effects & EFFECT_SSS) != 0) ? GPU_STENCIL_BIT : 0; GPU_framebuffer_clear(fbl->main_fb, clear_bits, clear_col, clear_depth, clear_stencil); diff --git a/source/blender/draw/engines/eevee/eevee_lightprobes.c b/source/blender/draw/engines/eevee/eevee_lightprobes.c index 008d458bc6a..3199fc430cf 100644 --- a/source/blender/draw/engines/eevee/eevee_lightprobes.c +++ b/source/blender/draw/engines/eevee/eevee_lightprobes.c @@ -330,7 +330,7 @@ void EEVEE_lightprobes_cache_init(EEVEE_ViewLayerData *sldata, EEVEE_Data *vedat static float error_col[3] = {1.0f, 0.0f, 1.0f}; struct GPUMaterial *gpumat = EEVEE_material_world_lightprobe_get(scene, wo); - GPUMaterialStatus status = GPU_material_status(gpumat); + eGPUMaterialStatus status = GPU_material_status(gpumat); switch (status) { case GPU_MAT_SUCCESS: diff --git a/source/blender/draw/engines/eevee/eevee_lights.c b/source/blender/draw/engines/eevee/eevee_lights.c index 820ead715d9..af3531e9a6c 100644 --- a/source/blender/draw/engines/eevee/eevee_lights.c +++ b/source/blender/draw/engines/eevee/eevee_lights.c @@ -528,7 +528,7 @@ void EEVEE_lights_cache_shcaster_object_add(EEVEE_ViewLayerData *sldata, Object void EEVEE_lights_cache_finish(EEVEE_ViewLayerData *sldata, EEVEE_Data *vedata) { EEVEE_LampsInfo *linfo = sldata->lamps; - GPUTextureFormat shadow_pool_format = GPU_R32F; + eGPUTextureFormat shadow_pool_format = GPU_R32F; sldata->common_data.la_num_light = linfo->num_light; diff --git a/source/blender/draw/engines/eevee/eevee_materials.c b/source/blender/draw/engines/eevee/eevee_materials.c index f0274eafaeb..6786bf7e911 100644 --- a/source/blender/draw/engines/eevee/eevee_materials.c +++ b/source/blender/draw/engines/eevee/eevee_materials.c @@ -1164,14 +1164,14 @@ static void material_opaque( scene, ma, vedata, false, false, use_ssrefract, use_sss, use_translucency, linfo->shadow_method); - GPUMaterialStatus status_mat_surface = GPU_material_status(*gpumat); + eGPUMaterialStatus status_mat_surface = GPU_material_status(*gpumat); /* Alpha CLipped : Discard pixel from depth pass, then * fail the depth test for shading. */ if (ELEM(ma->blend_method, MA_BM_CLIP, MA_BM_HASHED)) { *gpumat_depth = EEVEE_material_mesh_depth_get(scene, ma, (ma->blend_method == MA_BM_HASHED), false); - GPUMaterialStatus status_mat_depth = GPU_material_status(*gpumat_depth); + eGPUMaterialStatus status_mat_depth = GPU_material_status(*gpumat_depth); if (status_mat_depth != GPU_MAT_SUCCESS) { /* Mixing both flags. If depth shader fails, show it to the user by not using * the surface shader. */ diff --git a/source/blender/draw/engines/eevee/eevee_screen_raytrace.c b/source/blender/draw/engines/eevee/eevee_screen_raytrace.c index a3a11285e5e..440321b583e 100644 --- a/source/blender/draw/engines/eevee/eevee_screen_raytrace.c +++ b/source/blender/draw/engines/eevee/eevee_screen_raytrace.c @@ -159,7 +159,7 @@ int EEVEE_screen_raytrace_init(EEVEE_ViewLayerData *sldata, EEVEE_Data *vedata) int tracing_res[2] = {(int)viewport_size[0] / divisor, (int)viewport_size[1] / divisor}; int size_fs[2] = {(int)viewport_size[0], (int)viewport_size[1]}; const bool high_qual_input = true; /* TODO dither low quality input */ - const GPUTextureFormat format = (high_qual_input) ? GPU_RGBA16F : GPU_RGBA8; + const eGPUTextureFormat format = (high_qual_input) ? GPU_RGBA16F : GPU_RGBA8; /* MRT for the shading pass in order to output needed data for the SSR pass. */ effects->ssr_specrough_input = DRW_texture_pool_query_2D(size_fs[0], size_fs[1], format, -- cgit v1.2.3