mirror of
https://github.com/gwm17/glfw.git
synced 2024-11-26 20:28:49 -05:00
Removed GLFW_ACCELERATED window parameter.
This commit is contained in:
parent
98d02ebb1d
commit
3a72f33541
|
@ -390,7 +390,6 @@ extern "C" {
|
||||||
/* glfwGetWindowParam tokens */
|
/* glfwGetWindowParam tokens */
|
||||||
#define GLFW_ACTIVE 0x00020001
|
#define GLFW_ACTIVE 0x00020001
|
||||||
#define GLFW_ICONIFIED 0x00020002
|
#define GLFW_ICONIFIED 0x00020002
|
||||||
#define GLFW_ACCELERATED 0x00020003
|
|
||||||
#define GLFW_OPENGL_REVISION 0x00020004
|
#define GLFW_OPENGL_REVISION 0x00020004
|
||||||
|
|
||||||
/* The following constants are used for both glfwGetWindowParam
|
/* The following constants are used for both glfwGetWindowParam
|
||||||
|
|
|
@ -318,6 +318,7 @@ version of GLFW.</p>
|
||||||
<li>Removed <code>GLFW_OPENED</code> window parameter</li>
|
<li>Removed <code>GLFW_OPENED</code> window parameter</li>
|
||||||
<li>Removed nonsensical key actions for Unicode character input</li>
|
<li>Removed nonsensical key actions for Unicode character input</li>
|
||||||
<li>Removed <code>GLFWCALL</code> and <code>GLFWAPIENTRY</code> macros for stdcall calling convention</li>
|
<li>Removed <code>GLFWCALL</code> and <code>GLFWAPIENTRY</code> macros for stdcall calling convention</li>
|
||||||
|
<li>Removed <code>GLFW_ACCELERATED</code> window parameter</li>
|
||||||
<li>Bugfix: The default OpenGL version in the <code>glfwinfo</code> test was set to 1.1</li>
|
<li>Bugfix: The default OpenGL version in the <code>glfwinfo</code> test was set to 1.1</li>
|
||||||
<li>Bugfix: The OpenGL profile and forward-compatibility window parameters were not saved after context creation</li>
|
<li>Bugfix: The OpenGL profile and forward-compatibility window parameters were not saved after context creation</li>
|
||||||
<li>Bugfix: The FSAA test did not check for the availability of <code>GL_ARB_multisample</code></li>
|
<li>Bugfix: The FSAA test did not check for the availability of <code>GL_ARB_multisample</code></li>
|
||||||
|
|
|
@ -1047,11 +1047,6 @@ void _glfwPlatformRefreshWindowParams(void)
|
||||||
|
|
||||||
// Since GLFW doesn't understand screens, we use virtual screen zero
|
// Since GLFW doesn't understand screens, we use virtual screen zero
|
||||||
|
|
||||||
[window->NSGL.pixelFormat getValues:&value
|
|
||||||
forAttribute:NSOpenGLPFAAccelerated
|
|
||||||
forVirtualScreen:0];
|
|
||||||
window->accelerated = value;
|
|
||||||
|
|
||||||
[window->NSGL.pixelFormat getValues:&value
|
[window->NSGL.pixelFormat getValues:&value
|
||||||
forAttribute:NSOpenGLPFAAlphaSize
|
forAttribute:NSOpenGLPFAAlphaSize
|
||||||
forVirtualScreen:0];
|
forVirtualScreen:0];
|
||||||
|
|
|
@ -211,7 +211,6 @@ struct _GLFWwindow
|
||||||
int samples;
|
int samples;
|
||||||
|
|
||||||
// OpenGL extensions and context attributes
|
// OpenGL extensions and context attributes
|
||||||
GLboolean accelerated; // GL_TRUE if OpenGL context is "accelerated"
|
|
||||||
int glMajor, glMinor, glRevision;
|
int glMajor, glMinor, glRevision;
|
||||||
GLboolean glForward, glDebug;
|
GLboolean glForward, glDebug;
|
||||||
int glProfile;
|
int glProfile;
|
||||||
|
|
|
@ -300,14 +300,6 @@ static void refreshContextParams(_GLFWwindow* window, int pixelFormat)
|
||||||
|
|
||||||
if (window->WGL.ARB_pixel_format)
|
if (window->WGL.ARB_pixel_format)
|
||||||
{
|
{
|
||||||
if (getPixelFormatAttrib(window, pixelFormat, WGL_ACCELERATION_ARB) !=
|
|
||||||
WGL_NO_ACCELERATION_ARB)
|
|
||||||
{
|
|
||||||
window->accelerated = GL_TRUE;
|
|
||||||
}
|
|
||||||
else
|
|
||||||
window->accelerated = GL_FALSE;
|
|
||||||
|
|
||||||
window->redBits =
|
window->redBits =
|
||||||
getPixelFormatAttrib(window, pixelFormat, WGL_RED_BITS_ARB);
|
getPixelFormatAttrib(window, pixelFormat, WGL_RED_BITS_ARB);
|
||||||
window->greenBits =
|
window->greenBits =
|
||||||
|
@ -353,10 +345,6 @@ static void refreshContextParams(_GLFWwindow* window, int pixelFormat)
|
||||||
DescribePixelFormat(window->WGL.DC, pixelFormat,
|
DescribePixelFormat(window->WGL.DC, pixelFormat,
|
||||||
sizeof(PIXELFORMATDESCRIPTOR), &pfd);
|
sizeof(PIXELFORMATDESCRIPTOR), &pfd);
|
||||||
|
|
||||||
// Is current OpenGL context accelerated?
|
|
||||||
window->accelerated = (pfd.dwFlags & PFD_GENERIC_ACCELERATED) ||
|
|
||||||
!(pfd.dwFlags & PFD_GENERIC_FORMAT) ? 1 : 0;
|
|
||||||
|
|
||||||
// "Standard" window parameters
|
// "Standard" window parameters
|
||||||
window->redBits = pfd.cRedBits;
|
window->redBits = pfd.cRedBits;
|
||||||
window->greenBits = pfd.cGreenBits;
|
window->greenBits = pfd.cGreenBits;
|
||||||
|
|
|
@ -682,8 +682,6 @@ GLFWAPI int glfwGetWindowParam(GLFWwindow handle, int param)
|
||||||
return window == _glfwLibrary.activeWindow;
|
return window == _glfwLibrary.activeWindow;
|
||||||
case GLFW_ICONIFIED:
|
case GLFW_ICONIFIED:
|
||||||
return window->iconified;
|
return window->iconified;
|
||||||
case GLFW_ACCELERATED:
|
|
||||||
return window->accelerated;
|
|
||||||
case GLFW_RED_BITS:
|
case GLFW_RED_BITS:
|
||||||
return window->redBits;
|
return window->redBits;
|
||||||
case GLFW_GREEN_BITS:
|
case GLFW_GREEN_BITS:
|
||||||
|
|
|
@ -233,10 +233,6 @@ static void refreshContextParams(_GLFWwindow* window, GLXFBConfigID fbconfigID)
|
||||||
abort();
|
abort();
|
||||||
}
|
}
|
||||||
|
|
||||||
// There is no clear definition of an "accelerated" context on X11/GLX, and
|
|
||||||
// true sounds better than false, so we hardcode true here
|
|
||||||
window->accelerated = GL_TRUE;
|
|
||||||
|
|
||||||
window->redBits = getFBConfigAttrib(window, *fbconfig, GLX_RED_SIZE);
|
window->redBits = getFBConfigAttrib(window, *fbconfig, GLX_RED_SIZE);
|
||||||
window->greenBits = getFBConfigAttrib(window, *fbconfig, GLX_GREEN_SIZE);
|
window->greenBits = getFBConfigAttrib(window, *fbconfig, GLX_GREEN_SIZE);
|
||||||
window->blueBits = getFBConfigAttrib(window, *fbconfig, GLX_BLUE_SIZE);
|
window->blueBits = getFBConfigAttrib(window, *fbconfig, GLX_BLUE_SIZE);
|
||||||
|
|
|
@ -42,7 +42,6 @@ typedef struct
|
||||||
|
|
||||||
static Param parameters[] =
|
static Param parameters[] =
|
||||||
{
|
{
|
||||||
{ GLFW_ACCELERATED, "accelerated" },
|
|
||||||
{ GLFW_RED_BITS, "red bits" },
|
{ GLFW_RED_BITS, "red bits" },
|
||||||
{ GLFW_GREEN_BITS, "green bits" },
|
{ GLFW_GREEN_BITS, "green bits" },
|
||||||
{ GLFW_BLUE_BITS, "blue bits" },
|
{ GLFW_BLUE_BITS, "blue bits" },
|
||||||
|
|
Loading…
Reference in New Issue
Block a user