From 801547ac166c1d9537e8dc4a11fe5765c069a647 Mon Sep 17 00:00:00 2001 From: baldurk Date: Mon, 13 Feb 2017 10:23:53 +0000 Subject: [PATCH] Delete stub gl_*_android files, and add gl_*_egl to VS project --- renderdoc/driver/gl/gl_hooks_android.cpp | 80 ------------------- renderdoc/driver/gl/gl_replay_android.cpp | 70 ---------------- renderdoc/driver/gl/renderdoc_gl.vcxproj | 4 +- .../driver/gl/renderdoc_gl.vcxproj.filters | 10 +-- 4 files changed, 7 insertions(+), 157 deletions(-) delete mode 100644 renderdoc/driver/gl/gl_hooks_android.cpp delete mode 100644 renderdoc/driver/gl/gl_replay_android.cpp diff --git a/renderdoc/driver/gl/gl_hooks_android.cpp b/renderdoc/driver/gl/gl_hooks_android.cpp deleted file mode 100644 index 96045ff32..000000000 --- a/renderdoc/driver/gl/gl_hooks_android.cpp +++ /dev/null @@ -1,80 +0,0 @@ -/****************************************************************************** - * The MIT License (MIT) - * - * Copyright (c) 2016-2017 Baldur Karlsson - * - * Permission is hereby granted, free of charge, to any person obtaining a copy - * of this software and associated documentation files (the "Software"), to deal - * in the Software without restriction, including without limitation the rights - * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell - * copies of the Software, and to permit persons to whom the Software is - * furnished to do so, subject to the following conditions: - * - * The above copyright notice and this permission notice shall be included in - * all copies or substantial portions of the Software. - * - * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR - * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, - * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE - * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER - * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, - * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN - * THE SOFTWARE. - ******************************************************************************/ - -#include -#include -#include "driver/gl/gl_common.h" -#include "driver/gl/gl_driver.h" -#include "driver/gl/gl_hookset.h" -#include "driver/gl/gl_hookset_defs.h" -#include "hooks/hooks.h" - -class OpenGLHook : LibraryHook -{ -public: - OpenGLHook() {} - ~OpenGLHook() {} - bool CreateHooks(const char *libName) { return false; } - void EnableHooks(const char *libName, bool enable) {} - void OptionsUpdated(const char *libName) {} -}; - -const GLHookSet &GetRealGLFunctions() -{ - static GLHookSet dummyHookset = {}; - RDCUNIMPLEMENTED("GetRealGLFunctions"); - return dummyHookset; -} - -void MakeContextCurrent(GLWindowingData data) -{ - RDCUNIMPLEMENTED("MakeContextCurrent"); -} - -GLWindowingData MakeContext(GLWindowingData share) -{ - RDCUNIMPLEMENTED("MakeContext"); - return GLWindowingData(); -} - -void DeleteContext(GLWindowingData context) -{ - RDCUNIMPLEMENTED("DeleteContext"); -} - -bool immediateBegin(GLenum mode, float width, float height) -{ - RDCUNIMPLEMENTED("immediateBegin"); - return false; -} - -void immediateVert(float x, float y, float u, float v) -{ - RDCUNIMPLEMENTED("immediateVert"); -} - -void immediateEnd() -{ - RDCUNIMPLEMENTED("immediateEnd"); -} diff --git a/renderdoc/driver/gl/gl_replay_android.cpp b/renderdoc/driver/gl/gl_replay_android.cpp deleted file mode 100644 index 4985f8db2..000000000 --- a/renderdoc/driver/gl/gl_replay_android.cpp +++ /dev/null @@ -1,70 +0,0 @@ -/****************************************************************************** - * The MIT License (MIT) - * - * Copyright (c) 2016-2017 Baldur Karlsson - * - * Permission is hereby granted, free of charge, to any person obtaining a copy - * of this software and associated documentation files (the "Software"), to deal - * in the Software without restriction, including without limitation the rights - * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell - * copies of the Software, and to permit persons to whom the Software is - * furnished to do so, subject to the following conditions: - * - * The above copyright notice and this permission notice shall be included in - * all copies or substantial portions of the Software. - * - * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR - * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, - * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE - * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER - * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, - * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN - * THE SOFTWARE. - ******************************************************************************/ - -#include "gl_replay.h" -#include "gl_driver.h" -#include "gl_resources.h" - -void GLReplay::MakeCurrentReplayContext(GLWindowingData *ctx) -{ - RDCUNIMPLEMENTED("GLReplay::MakeCurrentReplayContext"); -} - -void GLReplay::SwapBuffers(GLWindowingData *ctx) -{ - RDCUNIMPLEMENTED("GLReplay::SwapBuffers"); -} - -void GLReplay::CloseReplayContext() -{ - RDCUNIMPLEMENTED("GLReplay::CloseReplayContext"); -} - -uint64_t GLReplay::MakeOutputWindow(void *wn, bool depth) -{ - RDCUNIMPLEMENTED("GLReplay::MakeOutputWindow"); - return 0; -} - -void GLReplay::DestroyOutputWindow(uint64_t id) -{ - RDCUNIMPLEMENTED("GLReplay::DestroyOutputWindow"); -} - -void GLReplay::GetOutputWindowDimensions(uint64_t id, int32_t &w, int32_t &h) -{ - RDCUNIMPLEMENTED("GLReplay::GetOutputWindowDimensions"); -} - -bool GLReplay::IsOutputWindowVisible(uint64_t id) -{ - RDCUNIMPLEMENTED("GLReplay::IsOutputWindowVisible"); - return false; -} - -ReplayCreateStatus GL_CreateReplayDevice(const char *logfile, IReplayDriver **driver) -{ - RDCUNIMPLEMENTED("GL_CreateReplayDevice"); - return eReplayCreate_APIHardwareUnsupported; -} diff --git a/renderdoc/driver/gl/renderdoc_gl.vcxproj b/renderdoc/driver/gl/renderdoc_gl.vcxproj index 8222582e6..304b95f2e 100644 --- a/renderdoc/driver/gl/renderdoc_gl.vcxproj +++ b/renderdoc/driver/gl/renderdoc_gl.vcxproj @@ -41,7 +41,7 @@ - + true @@ -54,7 +54,7 @@ - + true diff --git a/renderdoc/driver/gl/renderdoc_gl.vcxproj.filters b/renderdoc/driver/gl/renderdoc_gl.vcxproj.filters index 3a9a6d940..ea44ed22e 100644 --- a/renderdoc/driver/gl/renderdoc_gl.vcxproj.filters +++ b/renderdoc/driver/gl/renderdoc_gl.vcxproj.filters @@ -34,7 +34,7 @@ {28fbc354-c414-4647-9ce6-0fcea2cbe845} - + {61304e3c-ff5e-4cb6-8c25-455f37d86b48} @@ -167,11 +167,11 @@ OS\Apple - - OS\Android + + OS\EGL - - OS\Android + + OS\EGL \ No newline at end of file