Changeset 186 for trunk


Ignore:
Timestamp:
Dec 2, 2010, 3:20:18 AM (15 years ago)
Author:
dmik
Message:

jdk/awt: java2d: Disabled Direct3D on OS/2 (see #30).

Location:
trunk/openjdk/jdk
Files:
3 edited

Legend:

Unmodified
Added
Removed

  • trunk/openjdk/jdk/make/sun/awt/FILES_c_windows.gmk

    r2 r186  
    127127        dxInit.cpp \
    128128        RegistryKey.cpp \
     129       
     130ifndef OS2_TEMP # D3D
     131FILES_cpp += \
    129132        D3DBlitLoops.cpp \
    130133        D3DContext.cpp \
    … …  
    135138        D3DTextRenderer_md.cpp \
    136139        D3DUtils.cpp \
     140
     141endif   
     142FILES_cpp += \
    137143        ddrawObject.cpp \
    138144        awt_AWTEvent.cpp \

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

    r182 r186  
    140140                      "GetFlagValues: DDraw/D3D is disabled on Windows Vista");
    141141    }
    142 
     142#ifdef __WIN32OS2__
     143    SetD3DEnabledFlag(env, FALSE, FALSE);
     144    J2dRlsTraceLn(J2D_TRACE_WARNING,
     145                  "GetFlagValues: D3D is disabled on OS/2");
     146#else
    143147    if (IS_NT && !(IS_WIN2000)) {
    144148        // Do not enable d3d on NT4; d3d is only supported through
    … …  
    157161                      "GetFlagValues: D3D is disabled on 64-bit OSs");
    158162    }
     163#endif
    159164    if (IS_WIN2000 && !ddLockSet) { // valid for win2k, XP, and future OSs
    160165        // Fix for cursor flicker on win2k and XP (bug 4409306).  The

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

    r182 r186  
    241241HRESULT DXObject::CreateD3DObject(IDirect3D7 **d3dObject)
    242242{
     243#ifdef __WIN32OS2__
     244    J2dTraceLn(J2D_TRACE_INFO, "DXObject::CreateD3DObject: Not implemented");
     245    return E_NOTIMPL;
     246#else
    243247    HRESULT ddResult = ddObject->QueryInterface(IID_IDirect3D7,
    244248                                                (void**)d3dObject);
    … …  
    249253    }
    250254    return ddResult;
     255#endif
    251256}
    252257
    … …  
    321326    IDirectDraw4    *ddObject;
    322327
    323     ddResult = DirectDrawCreate(lpGUID, &ddObject, NULL);
     328    ddResult = DirectDrawCreate(lpGUID, (LPDIRECTDRAW*)&ddObject, NULL);
    324329    if (ddResult != DD_OK) {
    325330        DebugPrintDirectDrawError(ddResult,
Note: See TracChangeset for help on using the changeset viewer.