From 7995c46f77bd1cf4ac5593489d9da08ef57e924b Mon Sep 17 00:00:00 2001 From: Robert Konrad Date: Tue, 26 Mar 2024 23:08:56 +0100 Subject: [PATCH] Remove remaining Tizen code --- .../OpenGL1/Sources/kinc/backend/OpenGL.cpp | 2 +- .../Sources/kinc/backend/VertexBufferImpl.h | 2 +- .../Graphics3/OpenGL1/Sources/kinc/backend/ogl.h | 4 ---- .../OpenGL/Sources/kinc/backend/graphics4/ogl.h | 4 ---- .../Sources/kinc/backend/graphics4/vertexbuffer.h | 2 +- Sources/kinc/io/filereader.h | 14 -------------- Sources/kinc/system.h | 2 +- kfile.js | 11 ----------- 8 files changed, 4 insertions(+), 37 deletions(-) diff --git a/Backends/Graphics3/OpenGL1/Sources/kinc/backend/OpenGL.cpp b/Backends/Graphics3/OpenGL1/Sources/kinc/backend/OpenGL.cpp index 5e343ecd1..a9c6a0c21 100644 --- a/Backends/Graphics3/OpenGL1/Sources/kinc/backend/OpenGL.cpp +++ b/Backends/Graphics3/OpenGL1/Sources/kinc/backend/OpenGL.cpp @@ -207,7 +207,7 @@ void Graphics3::init(int windowId, int depthBufferBits, int stencilBufferBits, b glGenVertexArraysOES(1, &arrayId[windowId]); #elif defined(KINC_MACOS) glGenVertexArraysAPPLE(1, &arrayId[windowId]); -#elif !defined(KINC_ANDROID) && !defined(KINC_EMSCRIPTEN) && !defined(KINC_TIZEN) && !defined(KINC_RASPBERRY_PI) +#elif !defined(KINC_ANDROID) && !defined(KINC_EMSCRIPTEN) && !defined(KINC_RASPBERRY_PI) glGenVertexArrays(1, &arrayId[windowId]); #endif glCheckErrors(); diff --git a/Backends/Graphics3/OpenGL1/Sources/kinc/backend/VertexBufferImpl.h b/Backends/Graphics3/OpenGL1/Sources/kinc/backend/VertexBufferImpl.h index 5d75456d6..a6171febf 100644 --- a/Backends/Graphics3/OpenGL1/Sources/kinc/backend/VertexBufferImpl.h +++ b/Backends/Graphics3/OpenGL1/Sources/kinc/backend/VertexBufferImpl.h @@ -15,7 +15,7 @@ namespace Kore { int myCount; int myStride; uint bufferId; - // #if defined KINC_ANDROID || defined KINC_EMSCRIPTEN || defined KINC_TIZEN + // #if defined KINC_ANDROID || defined KINC_EMSCRIPTEN Graphics4::VertexStructure structure; // #endif int instanceDataStepRate; diff --git a/Backends/Graphics3/OpenGL1/Sources/kinc/backend/ogl.h b/Backends/Graphics3/OpenGL1/Sources/kinc/backend/ogl.h index d5106cbde..559da666a 100644 --- a/Backends/Graphics3/OpenGL1/Sources/kinc/backend/ogl.h +++ b/Backends/Graphics3/OpenGL1/Sources/kinc/backend/ogl.h @@ -47,10 +47,6 @@ #include "GLES2/gl2.h" #endif -#ifdef KINC_TIZEN -#include -#endif - #include #if defined(NDEBUG) || defined(KINC_OSX) || defined(KINC_IOS) || defined(KINC_ANDROID) || 1 // Calling glGetError too early means trouble diff --git a/Backends/Graphics4/OpenGL/Sources/kinc/backend/graphics4/ogl.h b/Backends/Graphics4/OpenGL/Sources/kinc/backend/graphics4/ogl.h index ad30153ac..3c0f6c259 100644 --- a/Backends/Graphics4/OpenGL/Sources/kinc/backend/graphics4/ogl.h +++ b/Backends/Graphics4/OpenGL/Sources/kinc/backend/graphics4/ogl.h @@ -46,10 +46,6 @@ #include "EGL/eglext.h" #endif -#ifdef KINC_TIZEN -#include -#endif - #ifdef KINC_WASM #include #endif diff --git a/Backends/Graphics4/OpenGL/Sources/kinc/backend/graphics4/vertexbuffer.h b/Backends/Graphics4/OpenGL/Sources/kinc/backend/graphics4/vertexbuffer.h index bf6518f3c..46820a2e0 100644 --- a/Backends/Graphics4/OpenGL/Sources/kinc/backend/graphics4/vertexbuffer.h +++ b/Backends/Graphics4/OpenGL/Sources/kinc/backend/graphics4/vertexbuffer.h @@ -15,7 +15,7 @@ typedef struct { unsigned bufferId; int sectionStart; int sectionSize; - // #if defined KINC_ANDROID || defined KINC_EMSCRIPTEN || defined KINC_TIZEN + // #if defined KINC_ANDROID || defined KINC_EMSCRIPTEN kinc_g4_vertex_structure_t structure; // #endif int instanceDataStepRate; diff --git a/Sources/kinc/io/filereader.h b/Sources/kinc/io/filereader.h index 5ecd9cfd9..7026c9d40 100644 --- a/Sources/kinc/io/filereader.h +++ b/Sources/kinc/io/filereader.h @@ -252,10 +252,6 @@ const char *macgetresourcepath(void); #include #endif -#ifdef KINC_TIZEN -#include -#endif - #ifdef KINC_RASPBERRY_PI #define KINC_LINUX #endif @@ -387,16 +383,6 @@ bool kinc_internal_file_reader_open(kinc_file_reader_t *reader, const char *file strcat(filepath, "/"); strcat(filepath, filename); #endif -#ifdef KINC_TIZEN - for (int i = 0; i < Tizen::App::App::GetInstance()->GetAppDataPath().GetLength(); ++i) { - wchar_t c; - Tizen::App::App::GetInstance()->GetAppDataPath().GetCharAt(i, c); - filepath[i] = (char)c; - } - filepath[Tizen::App::App::GetInstance()->GetAppDataPath().GetLength()] = 0; - strcat(filepath, "/"); - strcat(filepath, filename); -#endif #ifdef KINC_WINDOWS // Drive letter or network diff --git a/Sources/kinc/system.h b/Sources/kinc/system.h index 7f37e61c9..e4037c145 100644 --- a/Sources/kinc/system.h +++ b/Sources/kinc/system.h @@ -581,7 +581,7 @@ bool kinc_internal_frame(void) { void kinc_start(void) { running = true; -#if !defined(KINC_WASM) && !defined(KINC_EMSCRIPTEN) && !defined(KINC_TIZEN) +#if !defined(KINC_WASM) && !defined(KINC_EMSCRIPTEN) // if (Graphics::hasWindow()) Graphics::swapBuffers(); #if defined(KINC_IOS) || defined(KINC_MACOS) diff --git a/kfile.js b/kfile.js index 38a25b196..4a5339ae6 100644 --- a/kfile.js +++ b/kfile.js @@ -508,17 +508,6 @@ else if (platform === Platform.Pi) { project.addLib('asound'); project.addLib('X11'); } -else if (platform === Platform.Tizen) { - g4 = true; - addKincDefine('TIZEN'); - addBackend('System/Tizen'); - addBackend('System/POSIX'); - addBackend('Graphics4/OpenGL'); - project.addExclude('Backends/Graphics4/OpenGL/Sources/GL/**'); - addKincDefine('OPENGL'); - addKincDefine('OPENGL_ES'); - addKincDefine('POSIX'); -} else { plugin = true; g4 = true;