[Bf-blender-cvs] [3d3d7f6d55c] temp-drawcontext: GWN: Fix immediate mode when closing a window.
Clément Foucault
noreply at git.blender.org
Thu Feb 22 16:36:37 CET 2018
Commit: 3d3d7f6d55c9f82a2317c178740302bc819fcddb
Author: Clément Foucault
Date: Thu Feb 22 16:36:16 2018 +0100
Branches: temp-drawcontext
https://developer.blender.org/rB3d3d7f6d55c9f82a2317c178740302bc819fcddb
GWN: Fix immediate mode when closing a window.
===================================================================
M intern/gawain/src/gwn_immediate.c
===================================================================
diff --git a/intern/gawain/src/gwn_immediate.c b/intern/gawain/src/gwn_immediate.c
index f063665b423..0fe8e7a3f7c 100644
--- a/intern/gawain/src/gwn_immediate.c
+++ b/intern/gawain/src/gwn_immediate.c
@@ -28,8 +28,6 @@ typedef struct {
#if IMM_BATCH_COMBO
Gwn_Batch* batch;
#endif
- Gwn_Context* context;
-
// current draw call
GLubyte* buffer_data;
unsigned buffer_offset;
@@ -88,8 +86,7 @@ void immActivate(void)
assert(imm.prim_type == GWN_PRIM_NONE); // make sure we're not between a Begin/End pair
assert(imm.vao_id == 0);
#endif
- imm.vao_id = GWN_vao_alloc();
- imm.context = GWN_context_active_get();
+ imm.vao_id = GWN_vao_default();
}
void immDeactivate(void)
@@ -99,7 +96,6 @@ void immDeactivate(void)
assert(imm.prim_type == GWN_PRIM_NONE); // make sure we're not between a Begin/End pair
assert(imm.vao_id != 0);
#endif
- GWN_vao_free(imm.vao_id, imm.context);
imm.vao_id = 0;
imm.prev_enabled_attrib_bits = 0;
}
More information about the Bf-blender-cvs
mailing list