openrs2
/
openrs2-natives
1
0
Fork 0
Code Issues 19 Pull Requests Releases Activity

Use // for single-line comments

Browse Source
master
Graham 5 years ago
parent cf6597f45f
commit 6e702752d1
2 changed files with 35 additions and 35 deletions
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Show Stats Download Patch File Download Diff File
  1. 64
      gl-natives/src/main/c/jaggl.c
  2. 6
      misc-natives/src/main/c/jagmisc.c

64
gl-natives/src/main/c/jaggl.c
Unescape View File

@ -130,7 +130,7 @@ static HWND jaggl_window;
static HDC jaggl_device; static HDC jaggl_device;
static HGLRC jaggl_context; static HGLRC jaggl_context;
#elif defined(__APPLE__) && defined(__MACH__) #elif defined(__APPLE__) && defined(__MACH__)
/* copy of JAWT_MacOSXDrawingSurfaceInfo from Java 6's jawt_md.h */ // copy of JAWT_MacOSXDrawingSurfaceInfo from Java 6's jawt_md.h
struct jaggl_legacy_dsi { struct jaggl_legacy_dsi {
NSView *view; NSView *view;
}; };
@ -241,16 +241,16 @@ static void *jaggl_proc_addr(const char *name) {
- (void)blit { - (void)blit {
[lock lock]; [lock lock];
/* get current size */ // get current size
CGSize size = self.bounds.size; CGSize size = self.bounds.size;
GLint width = (GLint) size.width; GLint width = (GLint) size.width;
GLint height = (GLint) size.height; GLint height = (GLint) size.height;
/* check if we need to resize the framebuffer/off-screen window */ // check if we need to resize the framebuffer/off-screen window
bool resized = width != framebuffer_width || height != framebuffer_height; bool resized = width != framebuffer_width || height != framebuffer_height;
if (!framebuffer || resized) { if (!framebuffer || resized) {
/* create new framebuffer */ // create new framebuffer
GLuint new_framebuffer, new_renderbuffer_color, new_renderbuffer_depth; GLuint new_framebuffer, new_renderbuffer_color, new_renderbuffer_depth;
glGenFramebuffersEXT(1, &new_framebuffer); glGenFramebuffersEXT(1, &new_framebuffer);
@ -266,11 +266,11 @@ static void *jaggl_proc_addr(const char *name) {
glRenderbufferStorageEXT(GL_RENDERBUFFER_EXT, GL_DEPTH_COMPONENT24, width, height); glRenderbufferStorageEXT(GL_RENDERBUFFER_EXT, GL_DEPTH_COMPONENT24, width, height);
glFramebufferRenderbufferEXT(GL_FRAMEBUFFER_EXT, GL_DEPTH_ATTACHMENT_EXT, GL_RENDERBUFFER_EXT, new_renderbuffer_depth); glFramebufferRenderbufferEXT(GL_FRAMEBUFFER_EXT, GL_DEPTH_ATTACHMENT_EXT, GL_RENDERBUFFER_EXT, new_renderbuffer_depth);
/* clear the framebuffer */ // clear the framebuffer
glClearColor(0, 0, 0, 1); glClearColor(0, 0, 0, 1);
glClear(GL_COLOR_BUFFER_BIT | GL_DEPTH_BUFFER_BIT); glClear(GL_COLOR_BUFFER_BIT | GL_DEPTH_BUFFER_BIT);
/* copy the old framebuffer to the new framebuffer */ // copy the old framebuffer to the new framebuffer
if (framebuffer) { if (framebuffer) {
glBindFramebufferEXT(GL_READ_FRAMEBUFFER_EXT, framebuffer); glBindFramebufferEXT(GL_READ_FRAMEBUFFER_EXT, framebuffer);
glBindFramebufferEXT(GL_DRAW_FRAMEBUFFER_EXT, new_framebuffer); glBindFramebufferEXT(GL_DRAW_FRAMEBUFFER_EXT, new_framebuffer);
@ -280,14 +280,14 @@ static void *jaggl_proc_addr(const char *name) {
glBindFramebufferEXT(GL_FRAMEBUFFER_EXT, 0); glBindFramebufferEXT(GL_FRAMEBUFFER_EXT, 0);
/* delete the old framebuffer */ // delete the old framebuffer
if (framebuffer) { if (framebuffer) {
glDeleteRenderbuffersEXT(1, &renderbuffer_depth); glDeleteRenderbuffersEXT(1, &renderbuffer_depth);
glDeleteRenderbuffersEXT(1, &renderbuffer_color); glDeleteRenderbuffersEXT(1, &renderbuffer_color);
glDeleteFramebuffersEXT(1, &framebuffer); glDeleteFramebuffersEXT(1, &framebuffer);
} }
/* update framebuffer_* vars */ // update framebuffer_* vars
framebuffer = new_framebuffer; framebuffer = new_framebuffer;
renderbuffer_color = new_renderbuffer_color; renderbuffer_color = new_renderbuffer_color;
renderbuffer_depth = new_renderbuffer_depth; renderbuffer_depth = new_renderbuffer_depth;
@ -295,15 +295,15 @@ static void *jaggl_proc_addr(const char *name) {
framebuffer_height = height; framebuffer_height = height;
} }
/* bind the existing framebuffer */ // bind the existing framebuffer
glBindFramebufferEXT(GL_READ_FRAMEBUFFER_EXT, 0); glBindFramebufferEXT(GL_READ_FRAMEBUFFER_EXT, 0);
glBindFramebufferEXT(GL_DRAW_FRAMEBUFFER_EXT, framebuffer); glBindFramebufferEXT(GL_DRAW_FRAMEBUFFER_EXT, framebuffer);
/* clear the framebuffer */ // clear the framebuffer
glClearColor(0, 0, 0, 1); glClearColor(0, 0, 0, 1);
glClear(GL_COLOR_BUFFER_BIT | GL_DEPTH_BUFFER_BIT); glClear(GL_COLOR_BUFFER_BIT | GL_DEPTH_BUFFER_BIT);
/* copy current off-screen contents to the framebuffer */ // copy current off-screen contents to the framebuffer
glBlitFramebufferEXT(0, 0, framebuffer_width, framebuffer_height, 0, 0, framebuffer_width, framebuffer_height, GL_COLOR_BUFFER_BIT | GL_DEPTH_BUFFER_BIT, GL_NEAREST); glBlitFramebufferEXT(0, 0, framebuffer_width, framebuffer_height, 0, 0, framebuffer_width, framebuffer_height, GL_COLOR_BUFFER_BIT | GL_DEPTH_BUFFER_BIT, GL_NEAREST);
glBindFramebufferEXT(GL_FRAMEBUFFER_EXT, 0); glBindFramebufferEXT(GL_FRAMEBUFFER_EXT, 0);
@ -355,7 +355,7 @@ static void *jaggl_proc_addr(const char *name) {
} }
- (void)releaseCGLPixelFormat:(CGLPixelFormatObj)pix { - (void)releaseCGLPixelFormat:(CGLPixelFormatObj)pix {
/* empty */ // empty
} }
- (CGLContextObj)copyCGLContextForPixelFormat:(CGLPixelFormatObj)pix { - (CGLContextObj)copyCGLContextForPixelFormat:(CGLPixelFormatObj)pix {
@ -428,7 +428,7 @@ static PFNWGLCHOOSEPIXELFORMATARBPROC jaggl_wglChoosePixelFormatARB;
static PFNWGLGETEXTENSIONSSTRINGEXTPROC jaggl_wglGetExtensionsStringEXT; static PFNWGLGETEXTENSIONSSTRINGEXTPROC jaggl_wglGetExtensionsStringEXT;
static PFNWGLSWAPINTERVALEXTPROC jaggl_wglSwapIntervalEXT; static PFNWGLSWAPINTERVALEXTPROC jaggl_wglSwapIntervalEXT;
#elif defined(__APPLE__) && defined(__MACH__) #elif defined(__APPLE__) && defined(__MACH__)
/* CGL doesn't have extensions */ // CGL doesn't have extensions
#else #else
#error Unsupported platform #error Unsupported platform
#endif #endif
@ -486,7 +486,7 @@ static void jaggl_init_proc_table(void) {
jaggl_wglGetExtensionsStringEXT = (PFNWGLGETEXTENSIONSSTRINGEXTPROC) JAGGL_PROC_ADDR("wglGetExtensionsStringEXT"); jaggl_wglGetExtensionsStringEXT = (PFNWGLGETEXTENSIONSSTRINGEXTPROC) JAGGL_PROC_ADDR("wglGetExtensionsStringEXT");
jaggl_wglSwapIntervalEXT = (PFNWGLSWAPINTERVALEXTPROC) JAGGL_PROC_ADDR("wglSwapIntervalEXT"); jaggl_wglSwapIntervalEXT = (PFNWGLSWAPINTERVALEXTPROC) JAGGL_PROC_ADDR("wglSwapIntervalEXT");
#elif defined(__APPLE__) && defined(__MACH__) #elif defined(__APPLE__) && defined(__MACH__)
/* CGL doesn't have extensions */ // CGL doesn't have extensions
#else #else
#error Unsupported platform #error Unsupported platform
#endif #endif
@ -842,7 +842,7 @@ JNIEXPORT jstring JNICALL Java_jaggl_context_getExtensionsString(JNIEnv *env, jc
extensions_str = ""; extensions_str = "";
} }
#elif defined(__APPLE__) && defined(__MACH__) #elif defined(__APPLE__) && defined(__MACH__)
/* CGL doesn't have extensions */ // CGL doesn't have extensions
extensions_str = ""; extensions_str = "";
#else #else
#error Unsupported platform #error Unsupported platform
@ -927,11 +927,11 @@ JNIEXPORT jboolean JNICALL Java_jaggl_context_choosePixelFormat1(JNIEnv *env, jc
alpha_bits, alpha_bits,
GLX_DEPTH_SIZE, GLX_DEPTH_SIZE,
24, 24,
None, /* for GLX_DOUBLEBUFFER */ None, // for GLX_DOUBLEBUFFER
None, /* for GLX_SAMPLE_BUFFERS */ None, // for GLX_SAMPLE_BUFFERS
None, /* for True */ None, // for True
None, /* for GLX_SAMPLES */ None, // for GLX_SAMPLES
None, /* for num_samples */ None, // for num_samples
None None
}; };
@ -1007,12 +1007,12 @@ JNIEXPORT jboolean JNICALL Java_jaggl_context_choosePixelFormat1(JNIEnv *env, jc
alpha_bits, alpha_bits,
WGL_DEPTH_BITS_ARB, WGL_DEPTH_BITS_ARB,
24, 24,
0, /* for WGL_DOUBLE_BUFFER_ARB */ 0, // for WGL_DOUBLE_BUFFER_ARB
0, /* for GL_TRUE */ 0, // for GL_TRUE
0, /* for WGL_SAMPLE_BUFFERS_ARB */ 0, // for WGL_SAMPLE_BUFFERS_ARB
0, /* for GL_TRUE */ 0, // for GL_TRUE
0, /* for WGL_SAMPLES_ARB */ 0, // for WGL_SAMPLES_ARB
0, /* for num_samples */ 0, // for num_samples
0 0
}; };
@ -1107,10 +1107,10 @@ JNIEXPORT jboolean JNICALL Java_jaggl_context_choosePixelFormat1(JNIEnv *env, jc
kCGLPFADepthSize, kCGLPFADepthSize,
24, 24,
kCGLPFAMinimumPolicy, kCGLPFAMinimumPolicy,
(CGLPixelFormatAttribute) NULL, /* for kCGLPFADoubleBuffer */ (CGLPixelFormatAttribute) NULL, // for kCGLPFADoubleBuffer
(CGLPixelFormatAttribute) NULL, /* for kCGLPFAMultisample */ (CGLPixelFormatAttribute) NULL, // for kCGLPFAMultisample
(CGLPixelFormatAttribute) NULL, /* for kCGLPFASamples */ (CGLPixelFormatAttribute) NULL, // for kCGLPFASamples
(CGLPixelFormatAttribute) NULL, /* for num_samples */ (CGLPixelFormatAttribute) NULL, // for num_samples
(CGLPixelFormatAttribute) NULL (CGLPixelFormatAttribute) NULL
}; };
@ -1160,8 +1160,8 @@ JNIEXPORT jboolean JNICALL Java_jaggl_context_choosePixelFormat1(JNIEnv *env, jc
* but only because windows don't have left borders and there is * but only because windows don't have left borders and there is
* nothing above the Canvas in the Frame. * nothing above the Canvas in the Frame.
*/ */
jint x = dsi->bounds.x; /* should be dsi->bounds.x - insets.left */ jint x = dsi->bounds.x; // should be dsi->bounds.x - insets.left
jint y = 0; /* should be dsi->bounds.y - insets.top */ jint y = 0; // should be dsi->bounds.y - insets.top
jaggl_layer.frame = CGRectMake(x, platform_info.windowLayer.bounds.size.height - y - dsi->bounds.height, dsi->bounds.width, dsi->bounds.height); jaggl_layer.frame = CGRectMake(x, platform_info.windowLayer.bounds.size.height - y - dsi->bounds.height, dsi->bounds.width, dsi->bounds.height);
[jaggl_layer setNeedsDisplay]; [jaggl_layer setNeedsDisplay];
}); });

6
misc-natives/src/main/c/jagmisc.c
Unescape View File

@ -27,7 +27,7 @@ static inline int64_t jagmisc_to_nanos(LARGE_INTEGER count) {
} }
static DWORD WINAPI jagmisc_run(LPVOID lpParameter) { static DWORD WINAPI jagmisc_run(LPVOID lpParameter) {
/* pin this thread to the system's first processor */ // pin this thread to the system's first processor
HANDLE thread = GetCurrentThread(); HANDLE thread = GetCurrentThread();
DWORD_PTR affinity_mask = 0x1; DWORD_PTR affinity_mask = 0x1;
@ -39,12 +39,12 @@ static DWORD WINAPI jagmisc_run(LPVOID lpParameter) {
return EXIT_FAILURE; return EXIT_FAILURE;
} }
/* notify Java_jagex3_jagmisc_jagmisc_init() that the thread has started successfully */ // notify Java_jagex3_jagmisc_jagmisc_init() that the thread has started successfully
if (!SetEvent(jagmisc_start_event)) { if (!SetEvent(jagmisc_start_event)) {
return EXIT_FAILURE; return EXIT_FAILURE;
} }
/* serve time request and stop events */ // serve time request and stop events
const HANDLE handles[] = { jagmisc_time_request_event, jagmisc_stop_event }; const HANDLE handles[] = { jagmisc_time_request_event, jagmisc_stop_event };
for (;;) { for (;;) {
switch (WaitForMultipleObjects(2, handles, FALSE, INFINITE)) { switch (WaitForMultipleObjects(2, handles, FALSE, INFINITE)) {

Write Preview
Loading…
Cancel
Save