Detect support for vertex shader texture lookups.

Issue=95 TRAC #16568 Signed-off-by: Daniel Koch Author: Nicolas Capens git-svn-id: https://angleproject.googlecode.com/svn/trunk@636 736b8ea6-26fd-11df-bfd4-992fa37f6226
parent 15795192
#define MAJOR_VERSION 0 #define MAJOR_VERSION 0
#define MINOR_VERSION 0 #define MINOR_VERSION 0
#define BUILD_VERSION 0 #define BUILD_VERSION 0
#define BUILD_REVISION 635 #define BUILD_REVISION 636
#define STRINGIFY(x) #x #define STRINGIFY(x) #x
#define MACRO_STRINGIFY(x) STRINGIFY(x) #define MACRO_STRINGIFY(x) STRINGIFY(x)
......
// //
// Copyright (c) 2002-2010 The ANGLE Project Authors. All rights reserved. // Copyright (c) 2002-2011 The ANGLE Project Authors. All rights reserved.
// Use of this source code is governed by a BSD-style license that can be // Use of this source code is governed by a BSD-style license that can be
// found in the LICENSE file. // found in the LICENSE file.
// //
...@@ -614,7 +614,7 @@ void Display::destroyContext(gl::Context *context) ...@@ -614,7 +614,7 @@ void Display::destroyContext(gl::Context *context)
} }
} }
bool Display::isInitialized() bool Display::isInitialized() const
{ {
return mD3d9 != NULL && mConfigSet.size() > 0; return mD3d9 != NULL && mConfigSet.size() > 0;
} }
...@@ -854,4 +854,23 @@ const char *Display::getExtensionString() const ...@@ -854,4 +854,23 @@ const char *Display::getExtensionString() const
return mExtensionString.c_str(); return mExtensionString.c_str();
} }
// Only Direct3D 10 ready devices support all the necessary vertex texture formats.
// We test this using D3D9 by checking support for the R16F format.
bool Display::getVertexTextureSupport() const
{
return false; // Disabled until full VTF support is implemented
if (!isInitialized() || mDeviceCaps.PixelShaderVersion < D3DPS_VERSION(3, 0))
{
return false;
}
D3DDISPLAYMODE currentDisplayMode;
mD3d9->GetAdapterDisplayMode(mAdapter, &currentDisplayMode);
HRESULT result = mD3d9->CheckDeviceFormat(mAdapter, mDeviceType, currentDisplayMode.Format, D3DUSAGE_QUERY_VERTEXTEXTURE, D3DRTYPE_TEXTURE, D3DFMT_R16F);
return SUCCEEDED(result);
}
} }
// //
// Copyright (c) 2002-2010 The ANGLE Project Authors. All rights reserved. // Copyright (c) 2002-2011 The ANGLE Project Authors. All rights reserved.
// Use of this source code is governed by a BSD-style license that can be // Use of this source code is governed by a BSD-style license that can be
// found in the LICENSE file. // found in the LICENSE file.
// //
...@@ -49,7 +49,7 @@ class Display ...@@ -49,7 +49,7 @@ class Display
void destroySurface(egl::Surface *surface); void destroySurface(egl::Surface *surface);
void destroyContext(gl::Context *context); void destroyContext(gl::Context *context);
bool isInitialized(); bool isInitialized() const;
bool isValidConfig(EGLConfig config); bool isValidConfig(EGLConfig config);
bool isValidContext(gl::Context *context); bool isValidContext(gl::Context *context);
bool isValidSurface(egl::Surface *surface); bool isValidSurface(egl::Surface *surface);
...@@ -69,6 +69,7 @@ class Display ...@@ -69,6 +69,7 @@ class Display
virtual bool getLuminanceTextureSupport(); virtual bool getLuminanceTextureSupport();
virtual bool getLuminanceAlphaTextureSupport(); virtual bool getLuminanceAlphaTextureSupport();
virtual bool getNonPow2TextureSupport(); virtual bool getNonPow2TextureSupport();
virtual bool getVertexTextureSupport() const;
virtual D3DPOOL getBufferPool(DWORD usage) const; virtual D3DPOOL getBufferPool(DWORD usage) const;
bool isD3d9ExDevice() { return mD3d9Ex != NULL; } bool isD3d9ExDevice() { return mD3d9Ex != NULL; }
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment