Renamed org.lwjgl.opengl.Window.allowSoftwareOpenGL to org.lwjgl.opengl.Display.allowSoftwareOpenGL
This commit is contained in:
parent
d37c176cf4
commit
e446883a7f
|
@ -622,7 +622,7 @@ static bool initWindowGLX13(JNIEnv *env, jobject pixel_format) {
|
|||
throwException(env, "Could not create a GLX context");
|
||||
return false;
|
||||
}
|
||||
jboolean allow_software_acceleration = getBooleanProperty(env, "org.lwjgl.opengl.Window.allowSoftwareOpenGL");
|
||||
jboolean allow_software_acceleration = getBooleanProperty(env, "org.lwjgl.opengl.Display.allowSoftwareOpenGL");
|
||||
if (!allow_software_acceleration && (glXIsDirect(getDisplay(), display_context) == False)) {
|
||||
glXDestroyContext(getDisplay(), display_context);
|
||||
XFree(configs);
|
||||
|
@ -659,7 +659,7 @@ static bool initWindowGLX(JNIEnv *env, jobject pixel_format) {
|
|||
throwException(env, "Could not create a GLX context");
|
||||
return false;
|
||||
}
|
||||
jboolean allow_software_acceleration = getBooleanProperty(env, "org.lwjgl.opengl.Window.allowSoftwareOpenGL");
|
||||
jboolean allow_software_acceleration = getBooleanProperty(env, "org.lwjgl.opengl.Display.allowSoftwareOpenGL");
|
||||
if (!allow_software_acceleration && glXIsDirect(getDisplay(), display_context) == False) {
|
||||
glXDestroyContext(getDisplay(), display_context);
|
||||
XFree(vis_info);
|
||||
|
|
|
@ -110,7 +110,7 @@ static bool createPbufferUsingUniqueContext(JNIEnv *env, PbufferInfo *pbuffer_in
|
|||
throwException(env, "Could not create a GLX context");
|
||||
return false;
|
||||
}
|
||||
jboolean allow_software_acceleration = getBooleanProperty(env, "org.lwjgl.opengl.Window.allowSoftwareOpenGL");
|
||||
jboolean allow_software_acceleration = getBooleanProperty(env, "org.lwjgl.opengl.Display.allowSoftwareOpenGL");
|
||||
if (!allow_software_acceleration && glXIsDirect(getDisplay(), context) == False) {
|
||||
glXDestroyContext(getDisplay(), context);
|
||||
XFree(configs);
|
||||
|
|
|
@ -69,7 +69,7 @@ NSOpenGLContext *createContext(JNIEnv *env, jobject pixel_format, bool double_bu
|
|||
bool stereo = (bool)(*env)->GetBooleanField(env, pixel_format, (*env)->GetFieldID(env, cls_pixel_format, "stereo", "Z"));
|
||||
|
||||
attrib_list_t attribs;
|
||||
jboolean allow_software_acceleration = getBooleanProperty(env, "org.lwjgl.opengl.Window.allowSoftwareOpenGL");
|
||||
jboolean allow_software_acceleration = getBooleanProperty(env, "org.lwjgl.opengl.Display.allowSoftwareOpenGL");
|
||||
initAttribList(&attribs);
|
||||
if (!allow_software_acceleration)
|
||||
putAttrib(&attribs, NSOpenGLPFAAccelerated);
|
||||
|
|
|
@ -236,7 +236,7 @@ static int findPixelFormatFromBPP(JNIEnv *env, HDC hdc, jobject pixel_format, in
|
|||
}
|
||||
|
||||
if ((desc.dwFlags & PFD_GENERIC_FORMAT) != 0 || (desc.dwFlags & PFD_GENERIC_ACCELERATED) != 0) {
|
||||
jboolean allowSoftwareOpenGL = getBooleanProperty(env, "org.lwjgl.opengl.Window.allowSoftwareOpenGL");
|
||||
jboolean allowSoftwareOpenGL = getBooleanProperty(env, "org.lwjgl.opengl.Display.allowSoftwareOpenGL");
|
||||
// secondary check for software override
|
||||
if(!allowSoftwareOpenGL) {
|
||||
printfDebugJava(env, "Pixel format not accelerated");
|
||||
|
|
Loading…
Reference in New Issue