blender
/
blender
129
397
Fork 571
Code Issues 6.2k Pull Requests 752 Projects 19 Wiki Activity

GPU_select: remove unused finalize function 

Changed 2.8x code so this is no longer needed.
This commit is contained in:
Campbell Barton 2018-03-01 16:41:50 +11:00
parent 7f86afec9d
commit 172614fb7d
3 changed files with 3 additions and 43 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

23
source/blender/gpu/intern/gpu_select.c
View File

@ -149,29 +149,6 @@ bool GPU_select_load_id(uint id)
}
}
/**
* Needed when GL context of #GPU_select_end
* can't be used to finalize selection operations
* (because of context changes).
*/
void GPU_select_finalize(void)
{
if (!g_select_state.select_is_active)
return;
switch (g_select_state.algorithm) {
case ALGO_GL_LEGACY:
case ALGO_GL_QUERY:
{
break;
}
default: /* ALGO_GL_PICK */
{
gpu_select_pick_finalize();
}
}
}
/**
* Cleanup and flush selection results to buffer.
* Return number of hits and hits in buffer.

22
source/blender/gpu/intern/gpu_select_pick.c
View File

@ -255,7 +255,6 @@ typedef struct GPUPickState {
/* Set after first draw */
bool is_init;
bool is_finalized;
uint prev_id;
} gl;
@ -370,7 +369,6 @@ void gpu_select_pick_begin(
#endif
ps->gl.is_init = false;
ps->gl.is_finalized = false;
ps->gl.prev_id = 0;
}
else {
@ -531,20 +529,6 @@ bool gpu_select_pick_load_id(uint id)
return true;
}
/**
* (Optional), call before 'gpu_select_pick_end' if GL context is not kept.
* is not compatible with regular select case.
* */
void gpu_select_pick_finalize(void)
{
GPUPickState *ps = &g_pick_state;
if (ps->gl.is_init) {
/* force finishing last pass */
gpu_select_pick_load_id(ps->gl.prev_id);
}
ps->gl.is_finalized = true;
}
uint gpu_select_pick_end(void)
{
GPUPickState *ps = &g_pick_state;
@ -554,10 +538,10 @@ uint gpu_select_pick_end(void)
#endif
if (ps->is_cached == false) {
if (ps->gl.is_finalized == false) {
gpu_select_pick_finalize();
if (ps->gl.is_init) {
/* force finishing last pass */
gpu_select_pick_load_id(ps->gl.prev_id);
}
glPopAttrib();
glColorMask(GL_TRUE, GL_TRUE, GL_TRUE, GL_TRUE);
}

1
source/blender/gpu/intern/gpu_select_private.h
View File

@ -35,7 +35,6 @@
/* gpu_select_pick */
void gpu_select_pick_begin(unsigned int (*buffer)[4], unsigned int bufsize, const rcti *input, char mode);
bool gpu_select_pick_load_id(unsigned int id);
void gpu_select_pick_finalize(void);
unsigned int gpu_select_pick_end(void);
void gpu_select_pick_cache_begin(void);