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

V3D: Vertex selection: Fix opengl error.

Browse Source
This commit is contained in:
Clément Foucault
2018-02-26 20:07:39 +01:00
parent fa7e4cc685
commit f4cc9ba4c3
3 changed files with 9 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -103,6 +103,7 @@ void GWN_batch_program_set(Gwn_Batch*, GLuint program, const Gwn_ShaderInterface
void GWN_batch_program_use_begin(Gwn_Batch*); // call before Batch_Uniform (temp hack?)
void GWN_batch_program_use_end(Gwn_Batch*);
void GWN_batch_uniform_1ui(Gwn_Batch*, const char* name, int value);
void GWN_batch_uniform_1i(Gwn_Batch*, const char* name, int value);
void GWN_batch_uniform_1b(Gwn_Batch*, const char* name, bool value);
void GWN_batch_uniform_1f(Gwn_Batch*, const char* name, float value);

6
intern/gawain/src/gwn_batch.c
View File

@@ -429,6 +429,12 @@ void GWN_batch_program_use_end(Gwn_Batch* batch)
#define GET_UNIFORM const Gwn_ShaderInput* uniform = GWN_shaderinterface_uniform(batch->interface, name);
#endif
void GWN_batch_uniform_1ui(Gwn_Batch* batch, const char* name, int value)
{
GET_UNIFORM
glUniform1ui(uniform->location, value);
}
void GWN_batch_uniform_1i(Gwn_Batch* batch, const char* name, int value)
{
GET_UNIFORM

4
source/blender/editors/space_view3d/drawobject.c
View File

@@ -9623,7 +9623,7 @@ static void bbs_mesh_face(BMEditMesh *em, DerivedMesh *UNUSED(dm), const bool us
GPU_select_index_get(0, &selcol);
batch = DRW_mesh_batch_cache_get_triangles_with_select_mask(me, true);
GWN_batch_program_set_builtin(batch, GPU_SHADER_3D_UNIFORM_COLOR_U32);
GWN_batch_uniform_1i(batch, "color", selcol);
GWN_batch_uniform_1ui(batch, "color", selcol);
GWN_batch_draw(batch);
}
}
@@ -9753,7 +9753,7 @@ static void bbs_mesh_solid_verts(const EvaluationContext *UNUSED(eval_ctx), Scen
GPU_select_index_get(0, &selcol);
batch = DRW_mesh_batch_cache_get_triangles_with_select_mask(me, true);
GWN_batch_program_set_builtin(batch, GPU_SHADER_3D_UNIFORM_COLOR_U32);
GWN_batch_uniform_1i(batch, "color", selcol);
GWN_batch_uniform_1ui(batch, "color", selcol);
GWN_batch_draw(batch);
}