Changeset 185

Timestamp:

Dec 1, 2010, 3:31:57 AM (15 years ago)

Author:

dmik

Message:

jdk/awt: java2d: Continued.

Location:

trunk/openjdk/jdk/src/windows/native/sun/java2d

Files:

• d3d/D3DBlitLoops.cpp (modified) (2 diffs)
• d3d/D3DContext.h (modified) (1 diff)
• d3d/D3DUtils.h (modified) (2 diffs)
• windows/RegistryKey.cpp (modified) (1 diff)
• windows/ddrawObject.h (modified) (1 diff)
• windows/dxInit.cpp (modified) (2 diffs)

trunk/openjdk/jdk/src/windows/native/sun/java2d/d3d/D3DBlitLoops.cpp

@@ -110 +110 @@
                           tx1, ty1, tx2, ty2);
 
+#ifndef __WIN32OS2__
     if (hint == D3DSD_XFORM_BILINEAR) {
         d3dDevice->SetTextureStageState(0, D3DTSS_MAGFILTER, D3DTFG_LINEAR);
@@ -117 +118 @@
         d3dDevice->SetTextureStageState(0, D3DTSS_MINFILTER, D3DTFG_POINT);
     }
+#endif
 
     HRESULT res;

trunk/openjdk/jdk/src/windows/native/sun/java2d/d3d/D3DContext.h

@@ -341 +341 @@
 // - Various vertex formats -------------------------------------------
 
+#ifdef __WIN32OS2__
+#define D3DFVF_J2DLVERTEX D3DVT_LVERTEX
+#else
 #define D3DFVF_J2DLVERTEX (D3DFVF_XYZ | D3DFVF_DIFFUSE | D3DFVF_TEX1)
+#endif
 typedef struct _J2DLVERTEX {
     float x, y, z;

trunk/openjdk/jdk/src/windows/native/sun/java2d/d3d/D3DUtils.h

@@ -135 +135 @@
             break; \
         } else if (RES == DDERR_SURFACEBUSY || RES == DDERR_WASSTILLDRAWING) { \
-            J2dTraceLn(J2D_TRACE_VERBOSE, #PRIM ## ": surface is busy."); \
+            J2dTraceLn(J2D_TRACE_VERBOSE, PRIM ": surface is busy."); \
             continue; \
         } else if (RES == DDERR_SURFACELOST) { \
-            J2dTraceLn(J2D_TRACE_INFO, #PRIM ## ": dest surface lost."); \
+            J2dTraceLn(J2D_TRACE_INFO, PRIM ": dest surface lost."); \
             DST_WSDO->RestoreSurface(ENV, DST_WSDO); \
             break; \
         } else { \
-            DebugPrintDirectDrawError(RES, #PRIM); \
+            DebugPrintDirectDrawError(RES, PRIM); \
         } \
      } \
@@ -152 +152 @@
             break; \
         } else if (RES == DDERR_SURFACEBUSY || RES == DDERR_WASSTILLDRAWING) { \
-            J2dTraceLn(J2D_TRACE_VERBOSE, #PRIM ## ": surface is busy."); \
+            J2dTraceLn(J2D_TRACE_VERBOSE, PRIM ": surface is busy."); \
             continue; \
         } else if (RES == DDERR_SURFACELOST) { \
             if (FAILED((DST_WSDO)->lpSurface->IsLost())) { \
-                J2dTraceLn(J2D_TRACE_INFO, #PRIM ## ": dst surface lost."); \
+                J2dTraceLn(J2D_TRACE_INFO, PRIM ": dst surface lost."); \
                 (DST_WSDO)->RestoreSurface(ENV, (DST_WSDO)); \
             } \
             if (FAILED((SRC_WSDO)->lpSurface->IsLost())) { \
-                J2dTraceLn(J2D_TRACE_INFO, #PRIM ## ": src surface lost."); \
+                J2dTraceLn(J2D_TRACE_INFO, PRIM ": src surface lost."); \
                 (SRC_WSDO)->RestoreSurface(ENV, (SRC_WSDO)); \
             } \
             break; \
         } else { \
-            DebugPrintDirectDrawError(RES, #PRIM); \
+            DebugPrintDirectDrawError(RES, PRIM); \
         } \
      } \

trunk/openjdk/jdk/src/windows/native/sun/java2d/windows/RegistryKey.cpp

@@ -57 +57 @@
 #include <windows.h>
 #include <stdio.h>
+#ifdef __WIN32OS2__
+#include <minivcrt.h>
+#endif
+
 #include "Trace.h"
 #include "WindowsFlags.h"

trunk/openjdk/jdk/src/windows/native/sun/java2d/windows/ddrawObject.h

@@ -77 +77 @@
 #define IDirect3DDevice7    IDirect3DDevice2
 #define D3DDEVICEDESC7      D3DDEVICEDESC
+#define LPD3DDEVICEDESC7    LPD3DDEVICEDESC
 #endif
 

trunk/openjdk/jdk/src/windows/native/sun/java2d/windows/dxInit.cpp

@@ -31 +31 @@
 #include "WindowsFlags.h"
 #include "Devices.h"
+
+#ifdef __WIN32OS2__
+#include <minivcrt.h>
+#endif
 
 /**
@@ -572 +576 @@
  */
 BOOL DDCreateObject() {
+#ifdef __WIN32OS2__
+    typedef HRESULT (WINAPI * LPDIRECTDRAWENUMERATEEXA)( LPDDENUMCALLBACKEXA lpCallback, LPVOID lpContext, DWORD dwFlags);
+#endif
     LPDIRECTDRAWENUMERATEEXA lpDDEnum;