Changeset 182


Ignore:
Timestamp:
Nov 30, 2010, 1:41:16 PM (15 years ago)
Author:
dmik
Message:

jdk: Ported java2d (DirectDraw) bits.

Location:
trunk/openjdk/jdk/src/windows/native/sun/java2d
Files:
9 edited

Legend:

Unmodified
Added
Removed

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

    r2 r182  
    230230    DWORD GetMaxTextureHeight() { return d3dDevDesc.dwMaxTextureHeight; }
    231231    DWORD GetMaxTextureAspectRatio()
     232#ifdef __WIN32OS2__
     233        { return 0; };
     234#else
    232235        { return d3dDevDesc.dwMaxTextureAspectRatio; };
     236#endif
    233237    BOOL IsPow2TexturesOnly()
    234238        { return d3dDevDesc.dpcTriCaps.dwTextureCaps & D3DPTEXTURECAPS_POW2; };
    … …  
    444448    sun_java2d_d3d_D3DContext_J2D_D3D_ENABLED_OK
    445449
    446 #endif D3DCONTEXT_H
     450#endif // D3DCONTEXT_H

  • trunk/openjdk/jdk/src/windows/native/sun/java2d/windows/DDBlitLoops.cpp

    r2 r182  
    3636extern CriticalSection windowMoveLock;
    3737
     38#ifndef max
     39#define max(a,b) ( (a>b) ? a : b )
     40#endif
     41#ifndef min
     42#define min(a,b) ( (a<b) ? a : b )
     43#endif
     44
    3845extern "C" {
    3946

  • trunk/openjdk/jdk/src/windows/native/sun/java2d/windows/Win32SurfaceData.cpp

    r2 r182  
    8383        ZeroMemory(info, sizeof(ThreadGraphicsInfo));
    8484        TlsSetValue(threadInfoIndex, (LPVOID)info);
     85#ifndef __WIN32OS2__
    8586        J2dTraceLn2(J2D_TRACE_VERBOSE,
    8687                    "  current batch limit for for thread 0x%x is %d",
    … …  
    8990        // Fix for bug 4374079
    9091        ::GdiSetBatchLimit(1);
     92#endif
    9193
    9294        Disposer_AddRecord(env, JNI_GetCurrentThread(env),

  • trunk/openjdk/jdk/src/windows/native/sun/java2d/windows/WindowsFlags.cpp

    r2 r182  
    119119                                       sizeof(WCHAR));
    120120    wcscpy(j2dAccelKey, J2D_ACCEL_KEY_ROOT);
    121     wcscat(j2dAccelKey, javaVersion);
     121    wcscat(j2dAccelKey, (WCHAR *)javaVersion);
    122122    wcscat(j2dAccelKey, L"\\");
    123123    j2dAccelDriverKey =

  • trunk/openjdk/jdk/src/windows/native/sun/java2d/windows/WindowsFlags.h

    r2 r182  
    4343void SetDDEnabledFlag(JNIEnv *env, BOOL ddEnabled);
    4444
    45 #endif WINDOWSFLAGS_H
     45#endif // WINDOWSFLAGS_H

  • trunk/openjdk/jdk/src/windows/native/sun/java2d/windows/ddrawObject.cpp

    r2 r182  
    278278    DXObject *newDXObject;
    279279
     280#ifndef __WIN32OS2__
    280281    // First, try to create a DX7 object
    281282    FnDDCreateExFunc ddCreateEx = NULL;
    … …  
    316317        return NULL;
    317318    }
     319#else
     320    J2dTraceLn(J2D_TRACE_VERBOSE, "  Using DX4");
     321    IDirectDraw4    *ddObject;
     322
     323    ddResult = DirectDrawCreate(lpGUID, &ddObject, NULL);
     324    if (ddResult != DD_OK) {
     325        DebugPrintDirectDrawError(ddResult,
     326                                  "DDraw::CreateDDrawObject: "\
     327                                  "DirectDrawCreate failed");
     328        return NULL;
     329    }
     330    ddResult = ddObject->SetCooperativeLevel(NULL,
     331                                             DDSCL_NORMAL);
     332    if (ddResult != DD_OK) {
     333        DebugPrintDirectDrawError(ddResult,
     334                                  "DDraw::CreateDDrawObject: Error "\
     335                                  "setting cooperative level");
     336        return NULL;
     337    }
     338    newDXObject = new DXObject(ddObject, hMonitor);
     339#endif
    318340
    319341    return new DDraw(newDXObject);

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

    r2 r182  
    7171class D3DContext;
    7272
     73#ifdef __WIN32OS2__
     74#define IDirectDraw7        IDirectDraw4
     75#define IDirectDrawSurface7 IDirectDrawSurface4
     76#define IDirect3D7          IDirect3D2
     77#define IDirect3DDevice7    IDirect3DDevice2
     78#define D3DDEVICEDESC7      D3DDEVICEDESC
     79#endif
    7380
    7481class DXObject {
    … …  
    138145    HRESULT SetCooperativeLevel(HWND hWnd, DWORD dwFlags) {
    139146        return ddObject->SetCooperativeLevel(hWnd,
     147#ifdef DDSCL_FPUPRESERVE
    140148                                             (dwFlags | DDSCL_FPUPRESERVE));
     149#else
     150                                             dwFlags);
     151#endif
    141152    }
    142153    HRESULT CreateD3DObject(IDirect3D7 **d3dObject);
    … …  
    441452        if (count == 0) {
    442453            //J2dTraceLn1(J2D_TRACE_VERBOSE,
    443             //            "DDCriticalSection::Leave Invalid "\
    444             //            "decrement in DDCriticalSection "\
     454            //            "DDCriticalSection::Leave Invalid "
     455            //            "decrement in DDCriticalSection "
    445456            //            "for surface 0x%x\n",
    446457            //            lpSurface);
    … …  
    479490
    480491
    481 #endif DDRAWOBJECT_H
     492#endif // DDRAWOBJECT_H

  • trunk/openjdk/jdk/src/windows/native/sun/java2d/windows/ddrawUtils.h

    r2 r182  
    133133    } while(0)
    134134
    135 #endif DDRAWUTILS_H
     135#endif // DDRAWUTILS_H

  • trunk/openjdk/jdk/src/windows/native/sun/java2d/windows/dxInit.h

    r2 r182  
    5656BOOL    DDCreateObject();
    5757
    58 #endif DXINIT_H
     58#endif // DXINIT_H
Note: See TracChangeset for help on using the changeset viewer.