From 356bbf2bd325380e16fd77d34fffd084dc1c0928 Mon Sep 17 00:00:00 2001 From: Kevin Rushforth Date: Mon, 17 Oct 2005 22:56:23 +0000 Subject: Merged changes from dev-1_4 branch into the main trunk. NOTE: all 1.4 development will now proceed on the main trunk. The dev-1_4 branch is closed. git-svn-id: https://svn.java.net/svn/j3d-core~svn/trunk@445 ba19aa83-45c5-6ac9-afd3-db810772062c --- src/native/d3d/D3dDriverInfo.hpp | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'src/native/d3d/D3dDriverInfo.hpp') diff --git a/src/native/d3d/D3dDriverInfo.hpp b/src/native/d3d/D3dDriverInfo.hpp index e164fe8..5c5f0ca 100644 --- a/src/native/d3d/D3dDriverInfo.hpp +++ b/src/native/d3d/D3dDriverInfo.hpp @@ -26,7 +26,7 @@ extern int d3dDepthTable[D3DDEPTHFORMATSIZE]; class D3dDriverInfo { public: // DDraw Driver info - D3DADAPTER_IDENTIFIER8 adapterIdentifier; + D3DADAPTER_IDENTIFIER9 adapterIdentifier; // Desktop display mode for this adapter D3DDISPLAYMODE desktopMode; // monitor handle for this adapter @@ -56,6 +56,6 @@ extern const DWORD numDeviceTypes; extern const D3DDEVTYPE deviceTypes[2]; extern int requiredDeviceID; // force to use HAL/REF or exit extern int requiredDriverID; // force to use specific adapte -extern D3DLIGHT8 ambientLight; // constant ambient light +extern D3DLIGHT9 ambientLight; // constant ambient light extern BOOL implicitMultisample; #endif -- cgit v1.2.3