archive/blender-archive
Archived
1
1
Fork 0
Code Pull Requests Packages Activity

DRW: Change clip planes API.

Browse Source 
The draw manager now just set the number of active clip planes. It's now up to the engine to specify the plane equations as uniform/ubo/constant.
This commit is contained in:
Clément Foucault
2018-03-09 23:49:08 +01:00
parent 1b8ba6b8b9
commit dfd8a52cd2
5 changed files with 5 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
intern/gawain/gawain/gwn_shader_interface.h
View File

@@ -33,7 +33,6 @@ typedef enum {
GWN_UNIFORM_WORLDNORMAL, // mat3 WorldNormalMatrix
GWN_UNIFORM_CAMERATEXCO, // vec4 CameraTexCoFactors
GWN_UNIFORM_ORCO, // vec3 OrcoTexCoFactors[]
GWN_UNIFORM_CLIPPLANES, // vec4 ClipPlanes[]
GWN_UNIFORM_COLOR, // vec4 color
GWN_UNIFORM_EYE, // vec3 eye

1
intern/gawain/src/gwn_shader_interface.c
View File

@@ -45,7 +45,6 @@ static const char* BuiltinUniform_name(Gwn_UniformBuiltin u)
[GWN_UNIFORM_WORLDNORMAL] = "WorldNormalMatrix",
[GWN_UNIFORM_CAMERATEXCO] = "CameraTexCoFactors",
[GWN_UNIFORM_ORCO] = "OrcoTexCoFactors",
[GWN_UNIFORM_CLIPPLANES] = "ClipPlanes",
[GWN_UNIFORM_COLOR] = "color",
[GWN_UNIFORM_EYE] = "eye",

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

@@ -1294,7 +1294,7 @@ static void render_scene_to_planar(
* to invert the facing for backface culling to be the same. */
DRW_state_invert_facing();
DRW_state_clip_planes_add(ped->planer_eq_offset);
DRW_state_clip_planes_count_set(1);
/* Attach depth here since it's a DRW_TEX_TEMP */
DRW_framebuffer_texture_layer_attach(fbl->planarref_fb, txl->planar_depth, 0, layer, 0);

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

@@ -480,7 +480,7 @@ void DRW_state_lock(DRWState state);
void DRW_state_invert_facing(void);
void DRW_state_clip_planes_add(float plane_eq[4]);
void DRW_state_clip_planes_count_set(unsigned int plane_ct);
void DRW_state_clip_planes_reset(void);
/* Culling, return true if object is inside view frustum. */

6
source/blender/draw/intern/draw_manager_exec.c
View File

@@ -366,10 +366,10 @@ void DRW_state_invert_facing(void)
* and if the shaders have support for it (see usage of gl_ClipDistance).
* Be sure to call DRW_state_clip_planes_reset() after you finish drawing.
**/
void DRW_state_clip_planes_add(float plane_eq[4])
void DRW_state_clip_planes_count_set(unsigned int plane_ct)
{
BLI_assert(DST.num_clip_planes < MAX_CLIP_PLANES-1);
// copy_v4_v4(DST.view_data.clip_planes_eq[DST.num_clip_planes++], plane_eq);
BLI_assert(plane_ct <= MAX_CLIP_PLANES);
DST.num_clip_planes = plane_ct;
}
void DRW_state_clip_planes_reset(void)