diff options
| author | Clément Foucault <foucault.clem@gmail.com> | 2018-07-18 01:12:21 +0300 |
|---|---|---|
| committer | Clément Foucault <foucault.clem@gmail.com> | 2018-07-18 12:49:15 +0300 |
| commit | 8cd7828792419fb4eac9a2a477968535b4c71535 (patch) | |
| tree | 8fc733149fe07b7d9edd4b8b1e709519b4481887 /source/blender/render | |
| parent | 247ad2034de2c33a6d9cb7d3b6f1ef7ffa5b859d (diff) | |
GWN: Port to GPU module: Replace GWN prefix by GPU
Diffstat (limited to 'source/blender/render')
| -rw-r--r-- | source/blender/render/extern/include/RE_pipeline.h | 2 | ||||
| -rw-r--r-- | source/blender/render/intern/include/render_types.h | 2 | ||||
| -rw-r--r-- | source/blender/render/intern/source/pipeline.c | 16 |
3 files changed, 10 insertions, 10 deletions
diff --git a/source/blender/render/extern/include/RE_pipeline.h b/source/blender/render/extern/include/RE_pipeline.h index cb32efb0b0f..df8953857ee 100644 --- a/source/blender/render/extern/include/RE_pipeline.h +++ b/source/blender/render/extern/include/RE_pipeline.h @@ -315,7 +315,7 @@ void RE_current_scene_update_cb(struct Render *re, void *handle, void (*f)(void void RE_gl_context_create(Render *re); void RE_gl_context_destroy(Render *re); void *RE_gl_context_get(Render *re); -void *RE_gwn_context_get(Render *re); +void *RE_gpu_context_get(Render *re); /* should move to kernel once... still unsure on how/where */ float RE_filter_value(int type, float x); diff --git a/source/blender/render/intern/include/render_types.h b/source/blender/render/intern/include/render_types.h index 117b82570e7..5d5d12f028a 100644 --- a/source/blender/render/intern/include/render_types.h +++ b/source/blender/render/intern/include/render_types.h @@ -160,7 +160,7 @@ struct Render { /* TODO replace by a whole draw manager. */ void *gl_context; - void *gwn_context; + void *gpu_context; }; /* **************** defines ********************* */ diff --git a/source/blender/render/intern/source/pipeline.c b/source/blender/render/intern/source/pipeline.c index af8746a4734..510a4aa4685 100644 --- a/source/blender/render/intern/source/pipeline.c +++ b/source/blender/render/intern/source/pipeline.c @@ -1043,10 +1043,10 @@ void RE_gl_context_create(Render *re) void RE_gl_context_destroy(Render *re) { /* Needs to be called from the thread which used the ogl context for rendering. */ - if (re->gwn_context) { - GWN_context_active_set(re->gwn_context); - GWN_context_discard(re->gwn_context); - re->gwn_context = NULL; + if (re->gpu_context) { + GPU_context_active_set(re->gpu_context); + GPU_context_discard(re->gpu_context); + re->gpu_context = NULL; } if (re->gl_context) { WM_opengl_context_dispose(re->gl_context); @@ -1059,12 +1059,12 @@ void *RE_gl_context_get(Render *re) return re->gl_context; } -void *RE_gwn_context_get(Render *re) +void *RE_gpu_context_get(Render *re) { - if (re->gwn_context == NULL) { - re->gwn_context = GWN_context_create(); + if (re->gpu_context == NULL) { + re->gpu_context = GPU_context_create(); } - return re->gwn_context; + return re->gpu_context; } /* ********* add object data (later) ******** */ |