H. Verbeet : d3d8: For render states D3DRS_POINTSPRITEENABLE and
Alexandre Julliard
julliard at wine.codeweavers.com
Mon Jan 23 05:05:21 CST 2006
Module: wine
Branch: refs/heads/master
Commit: ac1618179054c1e7f8a2e89f676d83ac879ea413
URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=ac1618179054c1e7f8a2e89f676d83ac879ea413
Author: H. Verbeet <hverbeet at gmail.com>
Date: Mon Jan 23 11:26:25 2006 +0100
d3d8: For render states D3DRS_POINTSPRITEENABLE and
D3DRS_MULTISAMPLEANTIALIAS, use GL_SUPPORT correctly.
---
dlls/d3d8/device.c | 44 +++++++++++++++++++-------------------------
1 files changed, 19 insertions(+), 25 deletions(-)
diff --git a/dlls/d3d8/device.c b/dlls/d3d8/device.c
index 363052d..4952d6e 100644
--- a/dlls/d3d8/device.c
+++ b/dlls/d3d8/device.c
@@ -3083,39 +3083,33 @@ HRESULT WINAPI IDirect3DDevice8Impl_Se
}
case D3DRS_POINTSPRITEENABLE :
{
- if(Value) {
- if(GL_SUPPORT(GL_ARB_point_sprite)) {
- glEnable(GL_POINT_SPRITE_ARB);
- checkGLcall("glEnable GL_POINT_SPRITE_ARB");
- } else {
- TRACE("Point sprites cannot be enabled in this version of opengl\n");
- }
+ if (!GL_SUPPORT(ARB_POINT_SPRITE)) {
+ TRACE("Point sprites not supported\n");
+ break;
+ }
+
+ if (Value) {
+ glEnable(GL_POINT_SPRITE_ARB);
+ checkGLcall("glEnable GL_POINT_SPRITE_ARB");
} else {
- if(GL_SUPPORT(GL_ARB_point_sprite)) {
- glDisable(GL_POINT_SPRITE_ARB);
- checkGLcall("glDisable GL_POINT_SPRITE_ARB");
- } else {
- TRACE("Point sprites cannot be disabled in this version of opengl\n");
- }
+ glDisable(GL_POINT_SPRITE_ARB);
+ checkGLcall("glDisable GL_POINT_SPRITE_ARB");
}
break;
}
case D3DRS_MULTISAMPLEANTIALIAS :
{
+ if (!GL_SUPPORT(ARB_MULTISAMPLE)) {
+ TRACE("Multisample antialiasing not supported\n");
+ break;
+ }
+
if(Value) {
- if(GL_SUPPORT(GL_ARB_multisample)) {
- glEnable(GL_MULTISAMPLE_ARB);
- checkGLcall("glEnable GL_MULTISAMPLE_ARB");
- } else {
- TRACE("Multisample antialiasing cannot be enabled in this version of opengl\n");
- }
+ glEnable(GL_MULTISAMPLE_ARB);
+ checkGLcall("glEnable GL_MULTISAMPLE_ARB");
} else {
- if(GL_SUPPORT(GL_ARB_multisample)) {
- glDisable(GL_MULTISAMPLE_ARB);
- checkGLcall("glDisable GL_MULTISAMPLE_ARB");
- } else {
- TRACE("Multisample antialiasing cannot be disabled in this version of opengl\n");
- }
+ glDisable(GL_MULTISAMPLE_ARB);
+ checkGLcall("glDisable GL_MULTISAMPLE_ARB");
}
break;
}
More information about the wine-cvs
mailing list