Commit: 7ac49a07c60111fe75805a5eb72824ab7d0bc777
Author: Clément Foucault
Date: Mon Dec 17 11:37:27 2018 +0100
Branches: blender2.8
https://developer.blender.org/rB7ac49a07c60111fe75805a5eb72824ab7d0bc777
Mesh Batch Cache: Port Texture paint batches to new batch request
===================================================================
M
source/blender/draw/engines/workbench/shaders/workbench_prepass_vert.glsl
M source/blender/draw/engines/workbench/workbench_deferred.c
M source/blender/draw/engines/workbench/workbench_forward.c
M source/blender/draw/intern/draw_cache_impl_mesh.c
M source/blender/draw/modes/paint_texture_mode.c
M source/blender/draw/modes/shaders/paint_texture_vert.glsl
M source/blender/gpu/GPU_batch.h
===================================================================
diff --git
a/source/blender/draw/engines/workbench/shaders/workbench_prepass_vert.glsl
b/source/blender/draw/engines/workbench/shaders/workbench_prepass_vert.glsl
index 62040da8524..7c5b528c40d 100644
--- a/source/blender/draw/engines/workbench/shaders/workbench_prepass_vert.glsl
+++ b/source/blender/draw/engines/workbench/shaders/workbench_prepass_vert.glsl
@@ -8,7 +8,8 @@ uniform mat3 NormalMatrix;
#ifndef HAIR_SHADER
in vec3 pos;
in vec3 nor;
-in vec2 uv;
+in vec2 u; /* active texture layer */
+#define uv u
#else /* HAIR_SHADER */
# ifdef V3D_SHADING_TEXTURE_COLOR
uniform samplerBuffer u; /* active texture layer */
diff --git a/source/blender/draw/engines/workbench/workbench_deferred.c
b/source/blender/draw/engines/workbench/workbench_deferred.c
index 065efa4053a..617108b1bde 100644
--- a/source/blender/draw/engines/workbench/workbench_deferred.c
+++ b/source/blender/draw/engines/workbench/workbench_deferred.c
@@ -822,23 +822,16 @@ void
workbench_deferred_solid_cache_populate(WORKBENCH_Data *vedata, Object *ob)
const Mesh *me = ob->data;
if (me->mloopuv) {
const int materials_len = MAX2(1,
(is_sculpt_mode ? 1 : ob->totcol));
- struct GPUMaterial **gpumat_array =
BLI_array_alloca(gpumat_array, materials_len);
- struct GPUBatch **geom_array = me->totcol ?
DRW_cache_mesh_surface_texpaint_get(ob) : NULL;
- if (materials_len > 0 && geom_array) {
- for (int i = 0; i < materials_len; i++)
{
- if (geom_array[i] == NULL) {
- continue;
- }
-
- Material *mat =
give_current_material(ob, i + 1);
- Image *image;
- ED_object_get_active_image(ob,
i + 1, &image, NULL, NULL, NULL);
- int color_type =
workbench_material_determine_color_type(wpd, image, ob);
- material =
get_or_create_material_data(vedata, ob, mat, image, color_type);
-
DRW_shgroup_call_object_add(material->shgrp, geom_array[i], ob);
- }
- is_drawn = true;
+ struct GPUBatch **geom_array =
DRW_cache_mesh_surface_texpaint_get(ob);
+ for (int i = 0; i < materials_len; i++) {
+ Material *mat =
give_current_material(ob, i + 1);
+ Image *image;
+ ED_object_get_active_image(ob, i + 1,
&image, NULL, NULL, NULL);
+ int color_type =
workbench_material_determine_color_type(wpd, image, ob);
+ material =
get_or_create_material_data(vedata, ob, mat, image, color_type);
+
DRW_shgroup_call_object_add(material->shgrp, geom_array[i], ob);
}
+ is_drawn = true;
}
}
diff --git a/source/blender/draw/engines/workbench/workbench_forward.c
b/source/blender/draw/engines/workbench/workbench_forward.c
index 5ccf17f6113..3b755b31156 100644
--- a/source/blender/draw/engines/workbench/workbench_forward.c
+++ b/source/blender/draw/engines/workbench/workbench_forward.c
@@ -503,33 +503,26 @@ void workbench_forward_cache_populate(WORKBENCH_Data
*vedata, Object *ob)
const Mesh *me = ob->data;
if (me->mloopuv) {
const int materials_len = MAX2(1,
(is_sculpt_mode ? 1 : ob->totcol));
- struct GPUMaterial **gpumat_array =
BLI_array_alloca(gpumat_array, materials_len);
- struct GPUBatch **geom_array = me->totcol ?
DRW_cache_mesh_surface_texpaint_get(ob) : NULL;
- if (materials_len > 0 && geom_array) {
- for (int i = 0; i < materials_len; i++)
{
- if (geom_array[i] == NULL) {
- continue;
- }
+ struct GPUBatch **geom_array =
DRW_cache_mesh_surface_texpaint_get(ob);
+ for (int i = 0; i < materials_len; i++) {
+ Material *mat =
give_current_material(ob, i + 1);
+ Image *image;
+ ED_object_get_active_image(ob, i + 1,
&image, NULL, NULL, NULL);
+ /* use OB_SOLID when no texture could
be determined */
- Material *mat =
give_current_material(ob, i + 1);
- Image *image;
- ED_object_get_active_image(ob,
i + 1, &image, NULL, NULL, NULL);
+ int color_type =
wpd->shading.color_type;
+ if (color_type ==
V3D_SHADING_TEXTURE_COLOR) {
/* use OB_SOLID when no texture
could be determined */
-
- int color_type =
wpd->shading.color_type;
- if (color_type ==
V3D_SHADING_TEXTURE_COLOR) {
- /* use OB_SOLID when no
texture could be determined */
- if (image == NULL) {
- color_type =
V3D_SHADING_MATERIAL_COLOR;
- }
+ if (image == NULL) {
+ color_type =
V3D_SHADING_MATERIAL_COLOR;
}
-
- material =
get_or_create_material_data(vedata, ob, mat, image, color_type);
-
DRW_shgroup_call_object_add(material->shgrp_object_outline, geom_array[i], ob);
-
DRW_shgroup_call_object_add(material->shgrp, geom_array[i], ob);
}
- is_drawn = true;
+
+ material =
get_or_create_material_data(vedata, ob, mat, image, color_type);
+
DRW_shgroup_call_object_add(material->shgrp_object_outline, geom_array[i], ob);
+
DRW_shgroup_call_object_add(material->shgrp, geom_array[i], ob);
}
+ is_drawn = true;
}
}
diff --git a/source/blender/draw/intern/draw_cache_impl_mesh.c
b/source/blender/draw/intern/draw_cache_impl_mesh.c
index 3aeeafc7891..1aa7a850da5 100644
--- a/source/blender/draw/intern/draw_cache_impl_mesh.c
+++ b/source/blender/draw/intern/draw_cache_impl_mesh.c
@@ -323,6 +323,17 @@ static void mesh_cd_layers_type_merge(
}
}
+static void mesh_cd_calc_active_uv_layer(
+ const Mesh *me, ushort cd_lused[CD_NUMTYPES])
+{
+ const CustomData *cd_ldata = (me->edit_btmesh) ?
&me->edit_btmesh->bm->ldata : &me->ldata;
+
+ int layer = CustomData_get_active_layer(cd_ldata, CD_MLOOPUV);
+ if (layer != -1) {
+ cd_lused[CD_MLOOPUV] |= (1 << layer);
+ }
+}
+
static void mesh_cd_calc_used_gpu_layers(
const Mesh *me, uchar cd_vused[CD_NUMTYPES], ushort
cd_lused[CD_NUMTYPES],
struct GPUMaterial **gpumat_array, int gpumat_array_len)
@@ -2625,84 +2636,6 @@ void DRW_mesh_batch_cache_free(Mesh *me)
/* GPUBatch cache usage. */
-static GPUVertBuf *mesh_batch_cache_get_tri_uv_active(
- MeshRenderData *rdata, MeshBatchCache *cache)
-{
- BLI_assert(rdata->types & (MR_DATATYPE_VERT | MR_DATATYPE_LOOPTRI |
MR_DATATYPE_LOOP | MR_DATATYPE_LOOPUV));
-
-
- if (cache->tri_aligned_uv == NULL) {
- const MLoopUV *mloopuv = rdata->mloopuv;
- int layer_offset;
- BMEditMesh *embm = rdata->edit_bmesh;
-
- /* edit mode */
- if (rdata->edit_bmesh) {
- BMesh *bm = embm->bm;
- layer_offset = CustomData_get_offset(&bm->ldata,
CD_MLOOPUV);
- if (layer_offset == -1) {
- return NULL;
- }
- }
- else if (mloopuv == NULL) {
- return NULL;
- }
-
- uint vidx = 0;
-
- static GPUVertFormat format = { 0 };
- static struct { uint uv; } attr_id;
- if (format.attr_len == 0) {
- attr_id.uv = GPU_vertformat_attr_add(&format, "uv",
GPU_COMP_F32, 2, GPU_FETCH_FLOAT);
- }
-
- const int tri_len = mesh_render_data_looptri_len_get(rdata);
-
- GPUVertBuf *vbo = cache->tri_aligned_uv =
GPU_vertbuf_create_with_format(&format);
-
- const int vbo_len_capacity = tri_len * 3;
- int vbo_len_used = 0;
- GPU_vertbuf_data_alloc(vbo, vbo_len_capacity);
-
- /* get uv's from active UVMap */
- if (rdata->edit_bmesh) {
- for (uint i = 0; i < tri_len; i++) {
- const BMLoop **bm_looptri = (const BMLoop
**)embm->looptris[i];
- if (BM_elem_flag_test(bm_looptri[0]->f,
BM_ELEM_HIDDEN)) {
- continue;
- }
- for (uint t = 0; t < 3; t++) {
- const BMLoop *loop = bm_looptri[t];
- const int index =
BM_elem_index_get(loop);
- if (index != -1) {
- const float *elem = ((MLoopUV
*)BM_ELEM_CD_GET_VOID_P(loop, layer_offset))->uv;
- GPU_vertbuf_attr_set(vbo,
attr_id.uv, vidx++, elem);
- }
- }
- }
- }
- else {
- /* object mode */
- for (int i = 0; i < tri_len; i++) {
- const MLoopTri *mlt = &rdata->mlooptri[i];
- GPU_vertbuf_attr_set(vbo, attr_id.uv, vidx++,
mloopuv[mlt->tri[0]].uv);
- GPU_vertbuf_attr_set(vbo, attr_id.uv, vidx++,
mloopuv[mlt->tri[1]].uv);
- GPU_vertbuf_attr_set(vbo, attr_id.uv, vidx++,
mloopuv[mlt->tri[2]].uv);
- }
- }
-
- vbo_len_used = vidx;
-
- if (vbo_len_capacity != vbo_len_used) {
- GPU_vertbuf_data_resize(vbo, vbo_len_used);
- }
-
- UNUSED_VARS_NDEBUG(vbo_len_used);
- }
-
- return cache->tri_aligned_uv;
-}
-
static void mesh_create_pos_and_nor_tess(MeshRenderData *rdata, GPUVertBuf
*vbo, bool use_hide)
{
static GPUVertFormat format = { 0 };
@@ -5155,13 +5088,12 @@ GPUBatch **DRW_mesh_batch_cache_get_surface_shaded(
char **auto_layer_names, int **auto_layer_is_srgb, int
*auto_layer_count)
{
MeshBatchCache *cache = mesh_batch_cache_get(me);
-
- BLI_assert(gpumat_array_len == cache->mat_len);
-
uchar cd_vneeded[CD_NUMTYPES] = {0};
ushort cd_lneeded[CD_NUMTYPES] = {0};
mesh_cd_calc_used_gpu_layers(me, cd_vneeded, cd_lneeded, gpumat_array,
gpumat_array_len);
+ BLI_assert(gpumat_array_len == cache->mat_len);
+
bool cd_overlap = mesh_cd_layers_type_overlap(cache->cd_vused,
cache->cd_lused,
cd_vneeded, cd_lneeded);
if (cd_overlap == false) {
@@ -5175,48 +5107,50 @@ GPUBatch **DRW_mesh_batch_cache_get_surface_shaded(
&cache->auto_layer_is_srgb,
&cache->auto_layer_len);
}
-
if (auto_layer_names) {
*auto_layer_names = cache->auto_layer_names;
*auto_layer_is_srgb = cache->auto_layer_is_srgb;
*auto_layer_count = cache->auto_layer_len;
}
-
for (int i = 0; i < cache->mat_len; ++i) {
DRW_batch_request(&cache->surf_per_mat[i]);
}
return cache->surf_per_mat;
}
+static void texpaint_request_active_uv(MeshBatchCache *cache, Mesh *me)
+{
+ uchar cd_vneeded[CD_NUMTYPES] = {0};
+ ushort cd_lneeded[CD_NUMTYPES] = {0};
+ mesh_cd_calc_active_uv_layer(me, cd_lneeded);
+ if (cd_lneeded[CD_MLOOPUV] == 0) {
+ /* This should not happen. */
+ BLI_assert(!"No uv layer available in texpaint, but batches
requested anyway!");
+ }
+ bool cd_overlap = mesh_cd_layers_type_overlap(cache->cd_vused,
cache->cd_lused,
+ cd_vneeded, cd_lneeded);
+ if (cd_overlap == false) {
+ /* XXX TODO(fclem): We are writting to batch cache here. Need
to make this thread safe. */
+ mesh_cd_layers_type_merge(cache->cd_vneeded, cache->cd_lneeded,
+ cd_vneeded, cd_lneeded);
+ }
@@ Diff output truncated at 10240 characters. @@
_______________________________________________
Bf-blender-cvs mailing list
[email protected]
https://lists.blender.org/mailman/listinfo/bf-blender-cvs
