From 8a7f317666caa41aad0428b5ed3f399cdfbbd816 Mon Sep 17 00:00:00 2001 From: Bastien Montagne Date: Mon, 25 Jun 2018 12:32:48 +0200 Subject: Cleanup: Nuke most of G.main from GPU code. --- source/gameengine/GamePlayer/ghost/GPG_ghost.cpp | 6 +++--- source/gameengine/Ketsji/KX_PythonInit.cpp | 2 +- .../Rasterizer/RAS_OpenGLRasterizer/RAS_OpenGLRasterizer.cpp | 11 ++++++----- 3 files changed, 10 insertions(+), 9 deletions(-) (limited to 'source/gameengine') diff --git a/source/gameengine/GamePlayer/ghost/GPG_ghost.cpp b/source/gameengine/GamePlayer/ghost/GPG_ghost.cpp index 6c541758cb4..42b603f8980 100644 --- a/source/gameengine/GamePlayer/ghost/GPG_ghost.cpp +++ b/source/gameengine/GamePlayer/ghost/GPG_ghost.cpp @@ -1102,11 +1102,11 @@ int main( stereoWindow, stereomode, alphaBackground, aasamples); if (SYS_GetCommandLineInt(syshandle, "nomipmap", 0)) { - GPU_set_mipmap(0); + GPU_set_mipmap(G_MAIN, 0); } - GPU_set_anisotropic(U.anisotropic_filter); - GPU_set_gpu_mipmapping(U.use_gpu_mipmap); + GPU_set_anisotropic(G_MAIN, U.anisotropic_filter); + GPU_set_gpu_mipmapping(G_MAIN, U.use_gpu_mipmap); } } } diff --git a/source/gameengine/Ketsji/KX_PythonInit.cpp b/source/gameengine/Ketsji/KX_PythonInit.cpp index 35adbc2d720..251273cf7a8 100644 --- a/source/gameengine/Ketsji/KX_PythonInit.cpp +++ b/source/gameengine/Ketsji/KX_PythonInit.cpp @@ -1185,7 +1185,7 @@ static PyObject *gPySetGLSLMaterialSetting(PyObject *, /* display lists and GLSL materials need to be remade */ if (sceneflag != gs->glslflag) { - GPU_materials_free(); + GPU_materials_free(G_MAIN); if (gp_KetsjiEngine) { KX_SceneList *scenes = gp_KetsjiEngine->CurrentScenes(); KX_SceneList::iterator it; diff --git a/source/gameengine/Rasterizer/RAS_OpenGLRasterizer/RAS_OpenGLRasterizer.cpp b/source/gameengine/Rasterizer/RAS_OpenGLRasterizer/RAS_OpenGLRasterizer.cpp index fa24395a74e..659576df1c3 100644 --- a/source/gameengine/Rasterizer/RAS_OpenGLRasterizer/RAS_OpenGLRasterizer.cpp +++ b/source/gameengine/Rasterizer/RAS_OpenGLRasterizer/RAS_OpenGLRasterizer.cpp @@ -60,6 +60,7 @@ extern "C"{ #include "BLF_api.h" #include "BKE_DerivedMesh.h" + #include "BKE_global.h" } @@ -148,7 +149,7 @@ RAS_OpenGLRasterizer::RAS_OpenGLRasterizer(RAS_ICanvas* canvas, RAS_STORAGE_TYPE RAS_OpenGLRasterizer::~RAS_OpenGLRasterizer() { // Restore the previous AF value - GPU_set_anisotropic(m_prevafvalue); + GPU_set_anisotropic(G_MAIN, m_prevafvalue); if (m_storage) delete m_storage; @@ -1158,7 +1159,7 @@ void RAS_OpenGLRasterizer::SetFrontFace(bool ccw) void RAS_OpenGLRasterizer::SetAnisotropicFiltering(short level) { - GPU_set_anisotropic((float)level); + GPU_set_anisotropic(G_MAIN, (float)level); } short RAS_OpenGLRasterizer::GetAnisotropicFiltering() @@ -1171,17 +1172,17 @@ void RAS_OpenGLRasterizer::SetMipmapping(MipmapOption val) if (val == RAS_IRasterizer::RAS_MIPMAP_LINEAR) { GPU_set_linear_mipmap(1); - GPU_set_mipmap(1); + GPU_set_mipmap(G_MAIN, 1); } else if (val == RAS_IRasterizer::RAS_MIPMAP_NEAREST) { GPU_set_linear_mipmap(0); - GPU_set_mipmap(1); + GPU_set_mipmap(G_MAIN, 1); } else { GPU_set_linear_mipmap(0); - GPU_set_mipmap(0); + GPU_set_mipmap(G_MAIN, 0); } } -- cgit v1.2.3