AstralTransRocketries/ClassiCube
1
0
Fork 0
mirror of https://github.com/ClassiCube/ClassiCube.git synced 2025-09-13 01:26:50 -04:00
Code Issues Packages Projects Releases Wiki Activity

Symbian: Minor code tidy up

Browse Source
This commit is contained in:
UnknownShadow200 2025-05-24 07:41:43 +10:00
parent 7e1bd3b3ef
commit 0624680953
4 changed files with 4 additions and 28 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
misc/opengl/GLCommon.h
View File

@ -71,6 +71,7 @@ typedef cc_uintptr GLpointer;
#define GL_MAX_TEXTURE_SIZE 0x0D33 #define GL_MAX_TEXTURE_SIZE 0x0D33
#define GL_DEPTH_BITS 0x0D56 #define GL_DEPTH_BITS 0x0D56
#define GL_PERSPECTIVE_CORRECTION_HINT 0x0C50
#define GL_FOG_HINT 0x0C54 #define GL_FOG_HINT 0x0C54
#define GL_NICEST 0x1102 #define GL_NICEST 0x1102
#define GL_COMPILE 0x1300 #define GL_COMPILE 0x1300

5
src/Graphics_GL1.c
View File

@ -480,9 +480,8 @@ static void Gfx_RestoreState(void) {
gfx_format = -1; gfx_format = -1;
_glHint(GL_FOG_HINT, GL_NICEST); _glHint(GL_FOG_HINT, GL_NICEST);
#if defined CC_BUILD_SYMBIAN _glHint(GL_PERSPECTIVE_CORRECTION_HINT, GL_NICEST);
_glHint(0x0C50 /*GL_PERSPECTIVE_CORRECTION_HINT*/, GL_NICEST);
#endif
_glAlphaFunc(GL_GREATER, 0.5f); _glAlphaFunc(GL_GREATER, 0.5f);
_glBlendFunc(GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA); _glBlendFunc(GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA);
_glDepthFunc(GL_LEQUAL); _glDepthFunc(GL_LEQUAL);

24
src/Platform_Symbian.cpp
View File

@ -217,17 +217,12 @@ cc_result Directory_Enum(const cc_string* dirPath, void* obj, Directory_EnumCall
len = String_Length(src); len = String_Length(src);
String_AppendUtf8(&path, src, len); String_AppendUtf8(&path, src, len);
#if defined CC_BUILD_SYMBIAN
{ {
char full_path[NATIVE_STR_LEN]; char full_path[NATIVE_STR_LEN];
struct stat sb; struct stat sb;
String_EncodeUtf8(full_path, &path); String_EncodeUtf8(full_path, &path);
is_dir = stat(full_path, &sb) == 0 && S_ISDIR(sb.st_mode); is_dir = stat(full_path, &sb) == 0 && S_ISDIR(sb.st_mode);
} }
#else
is_dir = entry->d_type == DT_DIR;
/* TODO: fallback to stat when this fails */
#endif
callback(&path, obj, is_dir); callback(&path, obj, is_dir);
errno = 0; errno = 0;
@ -552,9 +547,6 @@ void Socket_Close(cc_socket s) {
close(s); close(s);
} }
#if defined CC_BUILD_DARWIN || defined CC_BUILD_BEOS || defined CC_BUILD_SYMBIAN
/* poll is broken on old OSX apparently https://daniel.haxx.se/docs/poll-vs-select.html */
/* BeOS lacks support for poll */
static cc_result Socket_Poll(cc_socket s, int mode, cc_bool* success) { static cc_result Socket_Poll(cc_socket s, int mode, cc_bool* success) {
fd_set set; fd_set set;
struct timeval time = { 0 }; struct timeval time = { 0 };
@ -572,22 +564,6 @@ static cc_result Socket_Poll(cc_socket s, int mode, cc_bool* success) {
if (selectCount == -1) { *success = false; return errno; } if (selectCount == -1) { *success = false; return errno; }
*success = FD_ISSET(s, &set) != 0; return 0; *success = FD_ISSET(s, &set) != 0; return 0;
} }
#else
#include <poll.h>
static cc_result Socket_Poll(cc_socket s, int mode, cc_bool* success) {
struct pollfd pfd;
int flags;
pfd.fd = s;
pfd.events = mode == SOCKET_POLL_READ ? POLLIN : POLLOUT;
if (poll(&pfd, 1, 0) == -1) { *success = false; return errno; }
/* to match select, closed socket still counts as readable */
flags = mode == SOCKET_POLL_READ ? (POLLIN | POLLHUP) : POLLOUT;
*success = (pfd.revents & flags) != 0;
return 0;
}
#endif
cc_result Socket_CheckReadable(cc_socket s, cc_bool* readable) { cc_result Socket_CheckReadable(cc_socket s, cc_bool* readable) {
return Socket_Poll(s, SOCKET_POLL_READ, readable); return Socket_Poll(s, SOCKET_POLL_READ, readable);

2
src/Window_Symbian.cpp
View File

@ -615,7 +615,7 @@ cc_result CWindow::OpenBrowser(const cc_string* url) {
} }
void Window_PreInit(void) { void Window_PreInit(void) {
NormDevice.defaultBinds = symbian_binds; //NormDevice.defaultBinds = symbian_binds; TODO only use on devices with limited hardware
CCoeEnv* env = new (ELeave) CCoeEnv(); CCoeEnv* env = new (ELeave) CCoeEnv();
TRAPD(err, env->ConstructL(ETrue, 0)); TRAPD(err, env->ConstructL(ETrue, 0));