Changeset 1303Tweet

Timestamp:

Apr 28, 2012, 3:38:32 PM (9 years ago)

Author:

sam

Message:

gpu: temporarily enable alpha blending in the vertex buffer code.

Location:

trunk/src

Files:

• gpu/vertexbuffer.cpp (modified) (4 diffs)
• video.cpp (modified) (2 diffs)

trunk/src/gpu/vertexbuffer.cpp

@@ -124 +124 @@
 {
 #if defined _XBOX || defined USE_D3D9
+    g_d3ddevice->SetRenderState(D3DRS_ALPHABLENDENABLE, 1);
+    g_d3ddevice->SetRenderState(D3DRS_SRCBLEND, D3DBLEND_SRCALPHA);
+    g_d3ddevice->SetRenderState(D3DRS_DESTBLEND, D3DBLEND_INVSRCALPHA);
     if (FAILED(g_d3ddevice->SetRenderState(D3DRS_CULLMODE, D3DCULL_CW)))
         Abort();
@@ -134 +137 @@
     }
 #else
+#   if defined HAVE_GL_2X && !defined __APPLE__
+    glEnable(GL_ALPHA_TEST);
+    glAlphaFunc(GL_GEQUAL, 0.01f);
+#   endif
+    glEnable(GL_BLEND);
+    glBlendFunc(GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA);
+
     switch (type)
     {
@@ -148 +158 @@
 {
 #if defined _XBOX || defined USE_D3D9
-    if (FAILED(g_d3ddevice->SetRenderState(D3DRS_CULLMODE, D3DCULL_CW)))
-        Abort();
+    g_d3ddevice->SetRenderState(D3DRS_ALPHABLENDENABLE, 1);
+    g_d3ddevice->SetRenderState(D3DRS_SRCBLEND, D3DBLEND_SRCALPHA);
+    g_d3ddevice->SetRenderState(D3DRS_DESTBLEND, D3DBLEND_INVSRCALPHA);
+    g_d3ddevice->SetRenderState(D3DRS_CULLMODE, D3DCULL_CW);
     switch (type)
     {
@@ -158 +170 @@
     }
 #else
+#   if defined HAVE_GL_2X && !defined __APPLE__
+    glEnable(GL_ALPHA_TEST);
+    glAlphaFunc(GL_GEQUAL, 0.01f);
+#   endif
+    glEnable(GL_BLEND);
+    glBlendFunc(GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA);
+
     switch (type)
     {

trunk/src/video.cpp

@@ -132 +132 @@
 
     g_d3ddevice = VideoData::d3d_dev;
-
-    g_d3ddevice->SetRenderState(D3DRS_ALPHABLENDENABLE, 1);
-    g_d3ddevice->SetRenderState(D3DRS_SRCBLEND, D3DBLEND_SRCALPHA);
-    g_d3ddevice->SetRenderState(D3DRS_DESTBLEND, D3DBLEND_INVSRCALPHA);
 #else
 #   if defined USE_GLEW && !defined __APPLE__
@@ -155 +151 @@
 
 #   if defined HAVE_GL_2X && !defined __APPLE__
-    glShadeModel(GL_SMOOTH);
     glHint(GL_PERSPECTIVE_CORRECTION_HINT, GL_NICEST);
 #   endif