Commit e86ff2a3 authored by Huw Davies's avatar Huw Davies Committed by Alexandre Julliard

opengl/tests: Skip tests if we can't find a pixel format.

parent 252525da
...@@ -555,7 +555,12 @@ START_TEST(opengl) ...@@ -555,7 +555,12 @@ START_TEST(opengl)
hdc = GetDC(hwnd); hdc = GetDC(hwnd);
iPixelFormat = ChoosePixelFormat(hdc, &pfd); iPixelFormat = ChoosePixelFormat(hdc, &pfd);
ok(iPixelFormat > 0, "No pixelformat found!\n"); /* This should never happen as ChoosePixelFormat always returns a closest match */ if(iPixelFormat == 0)
{
/* This should never happen as ChoosePixelFormat always returns a closest match, but currently this fails in Wine if we don't have glX */
win_skip("Unable to find pixel format.\n");
goto cleanup;
}
/* We shouldn't be able to create a context from a hdc which doesn't have a pixel format set */ /* We shouldn't be able to create a context from a hdc which doesn't have a pixel format set */
hglrc = wglCreateContext(hdc); hglrc = wglCreateContext(hdc);
...@@ -615,6 +620,8 @@ START_TEST(opengl) ...@@ -615,6 +620,8 @@ START_TEST(opengl)
else else
trace("WGL_ARB_pbuffer not supported, skipping pbuffer test\n"); trace("WGL_ARB_pbuffer not supported, skipping pbuffer test\n");
cleanup:
ReleaseDC(hwnd, hdc);
DestroyWindow(hwnd); DestroyWindow(hwnd);
} }
} }
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment