griefith/test2
1
0
Fork 0
Code Issues Pull Requests Actions 1 Packages Projects Releases Wiki Activity

Cleanup: Move GPU_uniform_buffer.h to C++

Browse Source
This commit is contained in:
Hans Goudey
2024-02-11 16:10:00 -05:00
parent 2d3a1aa238
commit 1e1d7034ec
25 changed files with 27 additions and 35 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
intern/opencolorio/ocio_impl_glsl.cc
View File

@@ -21,7 +21,7 @@
#include "GPU_immediate.h"
#include "GPU_shader.h"
#include "GPU_uniform_buffer.h"
#include "GPU_uniform_buffer.hh"
#include "gpu_shader_create_info.hh"

2
source/blender/compositor/realtime_compositor/cached_resources/intern/ocio_color_space_conversion_shader.cc
View File

@@ -16,7 +16,7 @@
#include "GPU_capabilities.h"
#include "GPU_shader.h"
#include "GPU_texture.h"
#include "GPU_uniform_buffer.h"
#include "GPU_uniform_buffer.hh"
#include "gpu_shader_create_info.hh"

2
source/blender/compositor/realtime_compositor/intern/shader_operation.cc
View File

@@ -17,7 +17,7 @@
#include "GPU_material.hh"
#include "GPU_shader.h"
#include "GPU_texture.h"
#include "GPU_uniform_buffer.h"
#include "GPU_uniform_buffer.hh"
#include "gpu_shader_create_info.hh"

2
source/blender/draw/engines/eevee/eevee_lightprobes.cc
View File

@@ -25,7 +25,7 @@
#include "GPU_capabilities.h"
#include "GPU_material.hh"
#include "GPU_texture.h"
#include "GPU_uniform_buffer.h"
#include "GPU_uniform_buffer.hh"
#include "DEG_depsgraph_query.hh"

2
source/blender/draw/engines/eevee_next/eevee_depth_of_field.cc
View File

@@ -24,7 +24,7 @@
#include "GPU_platform.h"
#include "GPU_texture.h"
#include "GPU_uniform_buffer.h"
#include "GPU_uniform_buffer.hh"
#include "eevee_camera.hh"
#include "eevee_instance.hh"

2
source/blender/draw/engines/gpencil/gpencil_draw_data.cc
View File

@@ -16,7 +16,7 @@
#include "BLI_math_color.h"
#include "BLI_memblock.h"
#include "GPU_uniform_buffer.h"
#include "GPU_uniform_buffer.hh"
#include "IMB_imbuf_types.hh"

2
source/blender/draw/engines/gpencil/gpencil_engine_c.cc
View File

@@ -29,7 +29,7 @@
#include "DNA_view3d_types.h"
#include "GPU_texture.h"
#include "GPU_uniform_buffer.h"
#include "GPU_uniform_buffer.hh"
#include "gpencil_engine.h"

2
source/blender/draw/intern/DRW_gpu_wrapper.hh
View File

@@ -75,7 +75,7 @@
#include "GPU_framebuffer.h"
#include "GPU_storage_buffer.h"
#include "GPU_texture.h"
#include "GPU_uniform_buffer.h"
#include "GPU_uniform_buffer.hh"
namespace blender::draw {

2
source/blender/draw/intern/DRW_render.hh
View File

@@ -35,7 +35,7 @@
#include "GPU_shader.h"
#include "GPU_storage_buffer.h"
#include "GPU_texture.h"
#include "GPU_uniform_buffer.h"
#include "GPU_uniform_buffer.hh"
#include "draw_cache.hh"
#include "draw_common.h"

2
source/blender/draw/intern/draw_manager.h
View File

@@ -24,7 +24,7 @@
#include "GPU_drawlist.h"
#include "GPU_framebuffer.h"
#include "GPU_shader.h"
#include "GPU_uniform_buffer.h"
#include "GPU_uniform_buffer.hh"
#include "GPU_viewport.h"
#include "draw_instance_data.h"

2
source/blender/draw/intern/draw_manager_c.cc
View File

@@ -62,7 +62,7 @@
#include "GPU_platform.h"
#include "GPU_shader_shared.h"
#include "GPU_state.h"
#include "GPU_uniform_buffer.h"
#include "GPU_uniform_buffer.hh"
#include "GPU_viewport.h"
#include "RE_engine.h"

2
source/blender/draw/intern/draw_manager_data.cc
View File

@@ -46,7 +46,7 @@
#include "GPU_capabilities.h"
#include "GPU_material.hh"
#include "GPU_uniform_buffer.h"
#include "GPU_uniform_buffer.hh"
#include "intern/gpu_codegen.h"

2
source/blender/editors/gpencil_legacy/drawgpencil.cc
View File

@@ -35,7 +35,7 @@
#include "GPU_matrix.h"
#include "GPU_shader_shared.h"
#include "GPU_state.h"
#include "GPU_uniform_buffer.h"
#include "GPU_uniform_buffer.hh"
#include "ED_gpencil_legacy.hh"

2
source/blender/editors/space_node/drawnode.cc
View File

@@ -42,7 +42,7 @@
#include "GPU_platform.h"
#include "GPU_shader_shared.h"
#include "GPU_state.h"
#include "GPU_uniform_buffer.h"
#include "GPU_uniform_buffer.hh"
#include "DRW_engine.hh"

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

@@ -108,7 +108,7 @@ set(SRC
GPU_state.h
GPU_storage_buffer.h
GPU_texture.h
GPU_uniform_buffer.h
GPU_uniform_buffer.hh
GPU_vertex_buffer.h
GPU_vertex_format.h
GPU_viewport.h

2
source/blender/gpu/GPU_batch.h
View File

@@ -23,7 +23,7 @@
#include "GPU_index_buffer.h"
#include "GPU_shader.h"
#include "GPU_storage_buffer.h"
#include "GPU_uniform_buffer.h"
#include "GPU_uniform_buffer.hh"
#include "GPU_vertex_buffer.h"
#define GPU_BATCH_VBO_MAX_LEN 16

14
source/blender/gpu/GPU_uniform_buffer.h → source/blender/gpu/GPU_uniform_buffer.hh
View File

@@ -15,14 +15,10 @@
#pragma once
#ifdef __cplusplus
extern "C" {
#endif
struct ListBase;
/** Opaque type hiding blender::gpu::UniformBuf. */
typedef struct GPUUniformBuf GPUUniformBuf;
struct GPUUniformBuf;
GPUUniformBuf *GPU_uniformbuf_create_ex(size_t size, const void *data, const char *name);
/**
@@ -31,7 +27,7 @@ GPUUniformBuf *GPU_uniformbuf_create_ex(size_t size, const void *data, const cha
*
* \param inputs: ListBase of #BLI_genericNodeN(#GPUInput).
*/
GPUUniformBuf *GPU_uniformbuf_create_from_list(struct ListBase *inputs, const char *name);
GPUUniformBuf *GPU_uniformbuf_create_from_list(ListBase *inputs, const char *name);
#define GPU_uniformbuf_create(size) GPU_uniformbuf_create_ex(size, NULL, __func__);
@@ -42,7 +38,7 @@ void GPU_uniformbuf_update(GPUUniformBuf *ubo, const void *data);
void GPU_uniformbuf_bind(GPUUniformBuf *ubo, int slot);
void GPU_uniformbuf_bind_as_ssbo(GPUUniformBuf *ubo, int slot);
void GPU_uniformbuf_unbind(GPUUniformBuf *ubo);
void GPU_uniformbuf_unbind_all(void);
void GPU_uniformbuf_unbind_all();
void GPU_uniformbuf_clear_to_zero(GPUUniformBuf *ubo);
@@ -50,7 +46,3 @@ void GPU_uniformbuf_clear_to_zero(GPUUniformBuf *ubo);
#define GPU_ATTRIBUTE_UBO_BLOCK_NAME "unf_attrs"
#define GPU_LAYER_ATTRIBUTE_UBO_BLOCK_NAME "drw_layer_attrs"
#define GPU_NODE_TREE_UBO_SLOT 0
#ifdef __cplusplus
}
#endif

2
source/blender/gpu/intern/gpu_codegen.cc
View File

@@ -30,7 +30,7 @@
#include "GPU_context.h"
#include "GPU_material.hh"
#include "GPU_shader.h"
#include "GPU_uniform_buffer.h"
#include "GPU_uniform_buffer.hh"
#include "GPU_vertex_format.h"
#include "BLI_sys_types.h" /* for intptr_t support */

2
source/blender/gpu/intern/gpu_material.cc
View File

@@ -33,7 +33,7 @@
#include "GPU_material.hh"
#include "GPU_shader.h"
#include "GPU_texture.h"
#include "GPU_uniform_buffer.h"
#include "GPU_uniform_buffer.hh"
#include "DRW_engine.hh"

2
source/blender/gpu/intern/gpu_uniform_buffer.cc
View File

@@ -18,7 +18,7 @@
#include "GPU_context.h"
#include "GPU_material.hh"
#include "GPU_uniform_buffer.h"
#include "GPU_uniform_buffer.hh"
#include "gpu_uniform_buffer_private.hh"
/* -------------------------------------------------------------------- */

2
source/blender/gpu/intern/gpu_viewport.cc
View File

@@ -24,7 +24,7 @@
#include "GPU_immediate.h"
#include "GPU_matrix.h"
#include "GPU_texture.h"
#include "GPU_uniform_buffer.h"
#include "GPU_uniform_buffer.hh"
#include "GPU_viewport.h"
#include "DRW_engine.hh"

2
source/blender/gpu/metal/mtl_context.mm
View File

@@ -25,7 +25,7 @@
#include "GPU_shader.h"
#include "GPU_storage_buffer.h"
#include "GPU_texture.h"
#include "GPU_uniform_buffer.h"
#include "GPU_uniform_buffer.hh"
#include "GPU_vertex_buffer.h"
#include "intern/gpu_matrix_private.h"

2
source/blender/nodes/composite/nodes/node_composite_planetrackdeform.cc
View File

@@ -28,7 +28,7 @@
#include "GPU_shader.h"
#include "GPU_texture.h"
#include "GPU_uniform_buffer.h"
#include "GPU_uniform_buffer.hh"
#include "COM_algorithm_smaa.hh"
#include "COM_node_operation.hh"

2
source/blender/python/gpu/gpu_py_shader.cc
View File

@@ -15,7 +15,7 @@
#include "GPU_shader.h"
#include "GPU_texture.h"
#include "GPU_uniform_buffer.h"
#include "GPU_uniform_buffer.hh"
#include "../generic/py_capi_utils.h"
#include "../generic/python_compat.h"

2
source/blender/python/gpu/gpu_py_uniformbuffer.cc
View File

@@ -16,7 +16,7 @@
#include "BLI_string.h"
#include "GPU_context.h"
#include "GPU_uniform_buffer.h"
#include "GPU_uniform_buffer.hh"
#include "../generic/python_compat.h"