blender
/
blender
136
404
Fork 586
Code Issues 6.2k Pull Requests 761 Projects 19 Wiki Activity

GPU: Move gpu_extensions.c to C++

This commit is contained in:
Clément Foucault 2020-07-25 18:39:54 +02:00
parent 7c3eaffbbd
commit 9905db5557
2 changed files with 4 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
source/blender/gpu/CMakeLists.txt
View File

@ -58,12 +58,12 @@ set(SRC
intern/gpu_batch_utils.c
intern/gpu_buffers.c
intern/gpu_codegen.c
intern/gpu_extensions.c
intern/gpu_framebuffer.c
intern/gpu_immediate.c
intern/gpu_context.cc
intern/gpu_debug.cc
intern/gpu_element.cc
intern/gpu_extensions.cc
intern/gpu_immediate_util.c
intern/gpu_init_exit.c
intern/gpu_material.c

5
source/blender/gpu/intern/gpu_extensions.c → source/blender/gpu/intern/gpu_extensions.cc
View File

@ -104,7 +104,8 @@ static struct GPUGlobal {
static void gpu_detect_mip_render_workaround(void)
{
int cube_size = 2;
float *source_pix = MEM_callocN(sizeof(float) * 4 * 6 * cube_size * cube_size, __func__);
float *source_pix = (float *)MEM_callocN(sizeof(float) * 4 * 6 * cube_size * cube_size,
__func__);
float clear_color[4] = {1.0f, 0.5f, 0.0f, 0.0f};
GPUTexture *tex = GPU_texture_create_cube(cube_size, GPU_RGBA16F, source_pix, NULL);
@ -123,7 +124,7 @@ static void gpu_detect_mip_render_workaround(void)
GPU_framebuffer_restore();
GPU_framebuffer_free(fb);
float *data = GPU_texture_read(tex, GPU_DATA_FLOAT, 1);
float *data = (float *)GPU_texture_read(tex, GPU_DATA_FLOAT, 1);
GG.mip_render_workaround = !equals_v4v4(clear_color, data);
MEM_freeN(data);