Fix the KINC_PI situation

Kode · Mar 26, 2024 · 406c9e2 · 406c9e2
1 parent ea5a2a1
commit 406c9e2
Show file tree

Hide file tree

Showing 10 changed files with 15 additions and 15 deletions.
diff --git a/Backends/Graphics3/OpenGL1/Sources/kinc/backend/IndexBufferImpl.cpp b/Backends/Graphics3/OpenGL1/Sources/kinc/backend/IndexBufferImpl.cpp
@@ -12,7 +12,7 @@ Graphics3::IndexBuffer::IndexBuffer(int indexCount) : IndexBufferImpl(indexCount
 	glGenBuffers(1, &bufferId);
 	glCheckErrors();
 	data = new int[indexCount];
-#if defined(KINC_ANDROID) || defined(KINC_PI)
+#if defined(KINC_ANDROID) || defined(KINC_RASPBERRY_PI)
 	shortData = new u16[indexCount];
 #endif
 }
@@ -27,13 +27,13 @@ int *Graphics3::IndexBuffer::lock() {
 }
 
 void Graphics3::IndexBuffer::unlock() {
-#if defined(KINC_ANDROID) || defined(KINC_PI)
+#if defined(KINC_ANDROID) || defined(KINC_RASPBERRY_PI)
 	for (int i = 0; i < myCount; ++i)
 		shortData[i] = (u16)data[i];
 #endif
 	glBindBuffer(GL_ELEMENT_ARRAY_BUFFER, bufferId);
 	glCheckErrors();
-#if defined(KINC_ANDROID) || defined(KINC_PI)
+#if defined(KINC_ANDROID) || defined(KINC_RASPBERRY_PI)
 	glBufferData(GL_ELEMENT_ARRAY_BUFFER, myCount * 2, shortData, GL_STATIC_DRAW);
 	glCheckErrors();
 #else

diff --git a/Backends/Graphics3/OpenGL1/Sources/kinc/backend/IndexBufferImpl.h b/Backends/Graphics3/OpenGL1/Sources/kinc/backend/IndexBufferImpl.h
@@ -11,7 +11,7 @@ namespace Kore {
 		IndexBufferImpl(int count);
 		void unset();
 
-#if defined(KINC_ANDROID) || defined(KINC_PI)
+#if defined(KINC_ANDROID) || defined(KINC_RASPBERRY_PI)
 		u16 *shortData;
 #endif
 		int *data;

diff --git 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_PI)
+#elif !defined(KINC_ANDROID) && !defined(KINC_EMSCRIPTEN) && !defined(KINC_TIZEN) && !defined(KINC_RASPBERRY_PI)
 	glGenVertexArrays(1, &arrayId[windowId]);
 #endif
 	glCheckErrors();
@@ -314,7 +314,7 @@ void Graphics3::drawIndexedVertices() {
 
 void Graphics3::drawIndexedVertices(int start, int count) {
 #ifdef KINC_OPENGL_ES
-#if defined(KINC_ANDROID) || defined(KINC_PI)
+#if defined(KINC_ANDROID) || defined(KINC_RASPBERRY_PI)
 	glDrawElements(GL_TRIANGLES, count, GL_UNSIGNED_SHORT, (void *)(start * sizeof(GL_UNSIGNED_SHORT)));
 #else
 	glDrawElements(GL_TRIANGLES, count, GL_UNSIGNED_INT, (void *)(start * sizeof(GL_UNSIGNED_INT)));

diff --git a/Backends/Graphics3/OpenGL1/Sources/kinc/backend/ogl.h b/Backends/Graphics3/OpenGL1/Sources/kinc/backend/ogl.h
@@ -40,7 +40,7 @@
 #include <GL/glx.h>
 #endif
 
-#ifdef KINC_PI
+#ifdef KINC_RASPBERRY_PI
 // #define GL_GLEXT_PROTOTYPES
 #include "EGL/egl.h"
 #include "EGL/eglext.h"

diff --git a/Backends/Graphics4/OpenGL/Sources/kinc/backend/graphics4/OpenGL.c.h b/Backends/Graphics4/OpenGL/Sources/kinc/backend/graphics4/OpenGL.c.h
@@ -1117,7 +1117,7 @@ void kinc_g4_restore_render_target() {
 #endif
 }
 
-#if (defined(KINC_OPENGL) && !defined(KINC_PI) && !defined(KINC_ANDROID)) || (defined(KINC_ANDROID) && KINC_ANDROID_API >= 18)
+#if (defined(KINC_OPENGL) && !defined(KINC_RASPBERRY_PI) && !defined(KINC_ANDROID)) || (defined(KINC_ANDROID) && KINC_ANDROID_API >= 18)
 bool kinc_g4_init_occlusion_query(unsigned *occlusionQuery) {
 #if defined(KINC_OPENGL_ES) && defined(KINC_ANDROID) && KINC_ANDROID_API >= 18
 	if (gles_version >= 3 && glesGenQueries) {

diff --git a/Backends/Graphics4/OpenGL/Sources/kinc/backend/graphics4/ogl.h b/Backends/Graphics4/OpenGL/Sources/kinc/backend/graphics4/ogl.h
@@ -38,7 +38,7 @@
 #include <GL/glext.h>
 #endif
 
-#ifdef KINC_PI
+#ifdef KINC_RASPBERRY_PI
 // #define GL_GLEXT_PROTOTYPES
 #include "GLES2/gl2.h"
 

diff --git a/Backends/Graphics4/OpenGL/Sources/kinc/backend/graphics4/rendertarget.c.h b/Backends/Graphics4/OpenGL/Sources/kinc/backend/graphics4/rendertarget.c.h
@@ -66,7 +66,7 @@ bool kinc_opengl_internal_nonPow2RenderTargetsSupported() {
 static void setupDepthStencil(kinc_g4_render_target_t *renderTarget, GLenum texType, int depthBufferBits, int stencilBufferBits, int width, int height) {
 	if (depthBufferBits > 0 && stencilBufferBits > 0) {
 		renderTarget->impl._hasDepth = true;
-#if defined(KINC_OPENGL_ES) && !defined(KINC_PI) && !defined(KINC_EMSCRIPTEN)
+#if defined(KINC_OPENGL_ES) && !defined(KINC_RASPBERRY_PI) && !defined(KINC_EMSCRIPTEN)
 		GLenum internalFormat = GL_DEPTH24_STENCIL8_OES;
 #elif defined(KINC_OPENGL_ES)
 		GLenum internalFormat = 0x88F0; // GL_DEPTH24_STENCIL8_OES

diff --git a/Backends/System/Pi/Sources/kinc/backend/system.cpp b/Backends/System/Pi/Sources/kinc/backend/system.cpp
@@ -204,7 +204,7 @@ int createWindow(const char *title, int x, int y, int width, int height, Kore::W
 	else {
 		dst_rect.x = x;
 		dst_rect.y = y;
-#ifdef KINC_PI_SCALING
+#ifdef KINC_RASPBERRY_PI_SCALING
 		dst_rect.width = screen_width;
 		dst_rect.height = screen_height;
 #else
@@ -236,7 +236,7 @@ int createWindow(const char *title, int x, int y, int width, int height, Kore::W
 	else {
 		nativewindow.width = width;
 		nativewindow.height = height;
-#ifndef KINC_PI_SCALING
+#ifndef KINC_RASPBERRY_PI_SCALING
 		openXWindow(x, y, width, height);
 #endif
 	}
@@ -473,7 +473,7 @@ bool Kore::System::handleMessages() {
 		}
 	}
 
-#ifndef KINC_PI_SCALING
+#ifndef KINC_RASPBERRY_PI_SCALING
 	if (windowMode != Kore::WindowModeFullscreen) {
 		while (XPending(dpy) > 0) {
 			XEvent event;

diff --git a/Sources/kinc/io/filereader.h b/Sources/kinc/io/filereader.h
@@ -256,7 +256,7 @@ const char *macgetresourcepath(void);
 #include <FApp.h>
 #endif
 
-#ifdef KINC_PI
+#ifdef KINC_RASPBERRY_PI
 #define KINC_LINUX
 #endif
 

diff --git a/kfile.js b/kfile.js
@@ -488,7 +488,7 @@ else if (platform === Platform.Linux || platform === Platform.FreeBSD) {
 }
 else if (platform === Platform.Pi) {
 	g4 = true;
-	addKincDefine('PI');
+	addKincDefine('RASPBERRY_PI');
 	addBackend('System/Pi');
 	addBackend('System/POSIX');
 	addBackend('Graphics4/OpenGL');