[slimdx] r2186 committed - Removed the remaining D3DX stuff.

[sli...@googlecode.com]

Revision: 2186
Author: mike.popoloski
Date: Sat Mar 17 12:07:17 2012
Log: Removed the remaining D3DX stuff.
http://code.google.com/p/slimdx/source/detail?r=2186

Deleted:
/branches/lite/source/direct3d11/FastFourierTransform11.cpp
/branches/lite/source/direct3d11/FastFourierTransform11.h

/branches/lite/source/direct3d11/FastFourierTransformBufferRequirements11.cpp
/branches/lite/source/direct3d11/FastFourierTransformBufferRequirements11.h
/branches/lite/source/direct3d11/FastFourierTransformDescription11.cpp
/branches/lite/source/direct3d11/FastFourierTransformDescription11.h
/branches/lite/source/direct3d11/ImageInformation11.cpp
/branches/lite/source/direct3d11/ImageInformation11.h
/branches/lite/source/direct3d11/ImageLoadInformation11.cpp
/branches/lite/source/direct3d11/ImageLoadInformation11.h
/branches/lite/source/direct3d11/Scan11.cpp
/branches/lite/source/direct3d11/Scan11.h
/branches/lite/source/direct3d11/SegmentedScan11.cpp
/branches/lite/source/direct3d11/SegmentedScan11.h
/branches/lite/source/direct3d11/TextureLoadInformation11.cpp
/branches/lite/source/direct3d11/TextureLoadInformation11.h
Modified:
/branches/lite/build/SlimDX.sln
/branches/lite/build/SlimDX.vcxproj
/branches/lite/build/SlimDX.vcxproj.filters
/branches/lite/source/DataStream.h
/branches/lite/source/Utilities.h
/branches/lite/source/direct3d11/Enums11.h
/branches/lite/source/direct3d11/Resource11.cpp
/branches/lite/source/direct3d11/Resource11.h
/branches/lite/source/direct3d11/SamplerState11.cpp
/branches/lite/source/direct3d11/ShaderResourceView11.cpp
/branches/lite/source/direct3d11/ShaderResourceView11.h
/branches/lite/source/direct3d11/Texture1D11.cpp
/branches/lite/source/direct3d11/Texture1D11.h
/branches/lite/source/direct3d11/Texture2D11.cpp
/branches/lite/source/direct3d11/Texture2D11.h
/branches/lite/source/direct3d11/Texture3D11.cpp
/branches/lite/source/direct3d11/Texture3D11.h
/branches/lite/source/stdafx.h

=======================================
--- /branches/lite/source/direct3d11/FastFourierTransform11.cpp Sat Jan 28
10:03:11 2012
+++ /dev/null
@@ -1,280 +0,0 @@
-/*
-* Copyright (c) 2007-2012 SlimDX Group
-*
-* Permission is hereby granted, free of charge, to any person obtaining a
copy
-* of this software and associated documentation files (the "Software"), to
deal
-* in the Software without restriction, including without limitation the
rights
-* to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
-* copies of the Software, and to permit persons to whom the Software is
-* furnished to do so, subject to the following conditions:
-*
-* The above copyright notice and this permission notice shall be included
in
-* all copies or substantial portions of the Software.
-*
-* THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS
OR
-* IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-* FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL
THE
-* AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
-* LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING
FROM,
-* OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
-* THE SOFTWARE.
-*/
-#include "stdafx.h"
-
-#include "../stack_array.h"
-
-#include "Direct3D11Exception.h"
-#include "DeviceContext11.h"
-#include "UnorderedAccessView11.h"
-#include "FastFourierTransform11.h"
-
-using namespace System;
-
-namespace SlimDX
-{
-namespace Direct3D11
-{
- FastFourierTransform::FastFourierTransform( DeviceContext^ context,
FastFourierTransformDescription description )
- {
- ID3DX11FFT *pointer = NULL;
- D3DX11_FFT_BUFFER_INFO bufferInfo;
- D3DX11_FFT_DESC desc = description.ToUnmanaged();
-
- HRESULT hr = D3DX11CreateFFT( context->InternalPointer, &desc, 0,
&bufferInfo, &pointer );
- if (RECORD_D3D11(hr).IsFailure)
- throw gcnew Direct3D11Exception( Result::Last );
-
- Construct( pointer );
- bufferRequirements = FastFourierTransformBufferRequirements( bufferInfo
);
- }
-
- FastFourierTransform::FastFourierTransform( DeviceContext^ context,
FastFourierTransformDescription description,
FastFourierTransformCreationFlags flags )
- {
- ID3DX11FFT *pointer = NULL;
- D3DX11_FFT_BUFFER_INFO bufferInfo;
- D3DX11_FFT_DESC desc = description.ToUnmanaged();
-
- HRESULT hr = D3DX11CreateFFT( context->InternalPointer, &desc,
static_cast<UINT>( flags ), &bufferInfo, &pointer );
- if (RECORD_D3D11(hr).IsFailure)
- throw gcnew Direct3D11Exception( Result::Last );
-
- Construct( pointer );
- bufferRequirements = FastFourierTransformBufferRequirements( bufferInfo
);
- }
-
- FastFourierTransform^ FastFourierTransform::Create1DComplex(
DeviceContext^ context, int x )
- {
- return Create1DComplex( context, x,
FastFourierTransformCreationFlags::None );
- }
-
- FastFourierTransform^ FastFourierTransform::Create1DComplex(
DeviceContext^ context, int x, FastFourierTransformCreationFlags flags )
- {
- ID3DX11FFT *pointer = NULL;
- D3DX11_FFT_BUFFER_INFO bufferInfo;
-
- HRESULT hr = D3DX11CreateFFT1DComplex( context->InternalPointer, x,
static_cast<UINT>( flags ), &bufferInfo, &pointer );
- if (RECORD_D3D11(hr).IsFailure)
- return nullptr;
-
- FastFourierTransform^ result = FastFourierTransform::FromPointer(
pointer );
- result->bufferRequirements = FastFourierTransformBufferRequirements(
bufferInfo );
-
- return result;
- }
-
- FastFourierTransform^ FastFourierTransform::Create1DReal( DeviceContext^
context, int x )
- {
- return Create1DReal( context, x, FastFourierTransformCreationFlags::None
);
- }
-
- FastFourierTransform^ FastFourierTransform::Create1DReal( DeviceContext^
context, int x, FastFourierTransformCreationFlags flags )
- {
- ID3DX11FFT *pointer = NULL;
- D3DX11_FFT_BUFFER_INFO bufferInfo;
-
- HRESULT hr = D3DX11CreateFFT1DReal( context->InternalPointer, x,
static_cast<UINT>( flags ), &bufferInfo, &pointer );
- if (RECORD_D3D11(hr).IsFailure)
- return nullptr;
-
- FastFourierTransform^ result = FastFourierTransform::FromPointer(
pointer );
- result->bufferRequirements = FastFourierTransformBufferRequirements(
bufferInfo );
-
- return result;
- }
-
- FastFourierTransform^ FastFourierTransform::Create2DComplex(
DeviceContext^ context, int x, int y )
- {
- return Create2DComplex( context, x, y,
FastFourierTransformCreationFlags::None );
- }
-
- FastFourierTransform^ FastFourierTransform::Create2DComplex(
DeviceContext^ context, int x, int y, FastFourierTransformCreationFlags
flags )
- {
- ID3DX11FFT *pointer = NULL;
- D3DX11_FFT_BUFFER_INFO bufferInfo;
-
- HRESULT hr = D3DX11CreateFFT2DComplex( context->InternalPointer, x, y,
static_cast<UINT>( flags ), &bufferInfo, &pointer );
- if (RECORD_D3D11(hr).IsFailure)
- return nullptr;
-
- FastFourierTransform^ result = FastFourierTransform::FromPointer(
pointer );
- result->bufferRequirements = FastFourierTransformBufferRequirements(
bufferInfo );
-
- return result;
- }
-
- FastFourierTransform^ FastFourierTransform::Create2DReal( DeviceContext^
context, int x, int y )
- {
- return Create2DReal( context, x, y,
FastFourierTransformCreationFlags::None );
- }
-
- FastFourierTransform^ FastFourierTransform::Create2DReal( DeviceContext^
context, int x, int y, FastFourierTransformCreationFlags flags )
- {
- ID3DX11FFT *pointer = NULL;
- D3DX11_FFT_BUFFER_INFO bufferInfo;
-
- HRESULT hr = D3DX11CreateFFT2DReal( context->InternalPointer, x, y,
static_cast<UINT>( flags ), &bufferInfo, &pointer );
- if (RECORD_D3D11(hr).IsFailure)
- return nullptr;
-
- FastFourierTransform^ result = FastFourierTransform::FromPointer(
pointer );
- result->bufferRequirements = FastFourierTransformBufferRequirements(
bufferInfo );
-
- return result;
- }
-
- FastFourierTransform^ FastFourierTransform::Create3DComplex(
DeviceContext^ context, int x, int y, int z )
- {
- return Create3DComplex( context, x, y, z,
FastFourierTransformCreationFlags::None );
- }
-
- FastFourierTransform^ FastFourierTransform::Create3DComplex(
DeviceContext^ context, int x, int y, int z,
FastFourierTransformCreationFlags flags )
- {
- ID3DX11FFT *pointer = NULL;
- D3DX11_FFT_BUFFER_INFO bufferInfo;
-
- HRESULT hr = D3DX11CreateFFT3DComplex( context->InternalPointer, x, y,
z, static_cast<UINT>( flags ), &bufferInfo, &pointer );
- if (RECORD_D3D11(hr).IsFailure)
- return nullptr;
-
- FastFourierTransform^ result = FastFourierTransform::FromPointer(
pointer );
- result->bufferRequirements = FastFourierTransformBufferRequirements(
bufferInfo );
-
- return result;
- }
-
- FastFourierTransform^ FastFourierTransform::Create3DReal( DeviceContext^
context, int x, int y, int z )
- {
- return Create3DReal( context, x, y, z,
FastFourierTransformCreationFlags::None );
- }
-
- FastFourierTransform^ FastFourierTransform::Create3DReal( DeviceContext^
context, int x, int y, int z, FastFourierTransformCreationFlags flags )
- {
- ID3DX11FFT *pointer = NULL;
- D3DX11_FFT_BUFFER_INFO bufferInfo;
-
- HRESULT hr = D3DX11CreateFFT3DReal( context->InternalPointer, x, y, z,
static_cast<UINT>( flags ), &bufferInfo, &pointer );
- if (RECORD_D3D11(hr).IsFailure)
- return nullptr;
-
- FastFourierTransform^ result = FastFourierTransform::FromPointer(
pointer );
- result->bufferRequirements = FastFourierTransformBufferRequirements(
bufferInfo );
-
- return result;
- }
-
- float FastFourierTransform::ForwardScale::get()
- {
- return InternalPointer->GetForwardScale();
- }
-
- void FastFourierTransform::ForwardScale::set( float value )
- {
- HRESULT hr = InternalPointer->SetForwardScale( value );
- RECORD_D3D11( hr );
- }
-
- float FastFourierTransform::InverseScale::get()
- {
- return InternalPointer->GetInverseScale();
- }
-
- void FastFourierTransform::InverseScale::set( float value )
- {
- HRESULT hr = InternalPointer->SetInverseScale( value );
- RECORD_D3D11( hr );
- }
-
- Result FastFourierTransform::AttachBuffersAndPrecompute(
array<UnorderedAccessView^>^ tempBuffers, array<UnorderedAccessView^>^
precomputeBuffers )
- {
- if (tempBuffers == nullptr)
- throw gcnew ArgumentNullException("temporaryBuffers");
- if (precomputeBuffers == nullptr)
- throw gcnew ArgumentNullException("precomputeBuffers");
-
- if (tempBuffers->Length == 0)
- throw gcnew ArgumentOutOfRangeException("temporaryBuffers");
- if (precomputeBuffers->Length == 0)
- throw gcnew ArgumentOutOfRangeException("precomputeBuffers");
-
- stack_array<ID3D11UnorderedAccessView*> nativeTempBuffers =
stackalloc(ID3D11UnorderedAccessView*, tempBuffers->Length);
- stack_array<ID3D11UnorderedAccessView*> nativePrecomputeBuffers =
stackalloc(ID3D11UnorderedAccessView*, precomputeBuffers->Length);
-
- for (int i = 0; i < tempBuffers->Length; i++)
- nativeTempBuffers[i] = tempBuffers[i] == nullptr ? NULL :
tempBuffers[i]->InternalPointer;
-
- for (int i = 0; i < precomputeBuffers->Length; i++)
- nativePrecomputeBuffers[i] = precomputeBuffers[i] == nullptr ? NULL :
precomputeBuffers[i]->InternalPointer;
-
- HRESULT hr = InternalPointer->AttachBuffersAndPrecompute(
tempBuffers->Length, &nativeTempBuffers[0], precomputeBuffers->Length,
&nativePrecomputeBuffers[0] );
- return RECORD_D3D11( hr );
- }
-
- Result FastFourierTransform::ForwardTransform( UnorderedAccessView^
input, UnorderedAccessView^ output )
- {
- if ( output == nullptr )
- throw gcnew System::ArgumentNullException( "output" );
-
- ID3D11UnorderedAccessView* inputBuffer = input == nullptr ? NULL :
input->InternalPointer;
- ID3D11UnorderedAccessView* outputBuffer = output->InternalPointer;
-
- HRESULT hr = InternalPointer->ForwardTransform( inputBuffer,
&outputBuffer );
- return RECORD_D3D11( hr );
- }
-
- UnorderedAccessView^ FastFourierTransform::ForwardTransform(
UnorderedAccessView^ input )
- {
- ID3D11UnorderedAccessView* inputBuffer = input == nullptr ? NULL :
input->InternalPointer;
- ID3D11UnorderedAccessView* outputBuffer = NULL;
-
- HRESULT hr = InternalPointer->ForwardTransform( inputBuffer,
&outputBuffer );
- if (RECORD_D3D11(hr).IsFailure)
- return nullptr;
-
- return UnorderedAccessView::FromPointer( outputBuffer );
- }
-
- Result FastFourierTransform::InverseTransform( UnorderedAccessView^
input, UnorderedAccessView^ output )
- {
- if ( output == nullptr )
- throw gcnew System::ArgumentNullException( "output" );
-
- ID3D11UnorderedAccessView* inputBuffer = input == nullptr ? NULL :
input->InternalPointer;
- ID3D11UnorderedAccessView* outputBuffer = output->InternalPointer;
-
- HRESULT hr = InternalPointer->InverseTransform( inputBuffer,
&outputBuffer );
- return RECORD_D3D11( hr );
- }
-
- UnorderedAccessView^ FastFourierTransform::InverseTransform(
UnorderedAccessView^ input )
- {
- ID3D11UnorderedAccessView* inputBuffer = input == nullptr ? NULL :
input->InternalPointer;
- ID3D11UnorderedAccessView* outputBuffer = NULL;
-
- HRESULT hr = InternalPointer->InverseTransform( inputBuffer,
&outputBuffer );
- if (RECORD_D3D11(hr).IsFailure)
- return nullptr;
-
- return UnorderedAccessView::FromPointer( outputBuffer );
- }
-}
-}
=======================================
--- /branches/lite/source/direct3d11/FastFourierTransform11.h Sat Jan 28
10:03:11 2012
+++ /dev/null
@@ -1,244 +0,0 @@
-/*
-* Copyright (c) 2007-2012 SlimDX Group
-*
-* Permission is hereby granted, free of charge, to any person obtaining a
copy
-* of this software and associated documentation files (the "Software"), to
deal
-* in the Software without restriction, including without limitation the
rights
-* to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
-* copies of the Software, and to permit persons to whom the Software is
-* furnished to do so, subject to the following conditions:
-*
-* The above copyright notice and this permission notice shall be included
in
-* all copies or substantial portions of the Software.
-*
-* THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS
OR
-* IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-* FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL
THE
-* AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
-* LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING
FROM,
-* OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
-* THE SOFTWARE.
-*/
-#pragma once
-
-#include "../ComObject.h"
-#include "../dxgi/Enums.h"
-
-#include "Enums11.h"
-#include "FastFourierTransformDescription11.h"
-#include "FastFourierTransformBufferRequirements11.h"
-
-namespace SlimDX
-{
- namespace Direct3D11
- {
- ref class Device;
- ref class UnorderedAccessView;
-
- /// <summary>
- /// An object that encapsulates forward and inverse FFTs.
- /// </summary>
- /// <unmanaged>ID3DX11FFT</unmanaged>
- public ref class FastFourierTransform : public ComObject
- {
- COMOBJECT(ID3DX11FFT, FastFourierTransform);
-
- private:
- FastFourierTransformBufferRequirements bufferRequirements;
-
- public:
- /// <summary>
- /// Initializes a new instance of the <see
cref="FastFourierTransform"/> class.
- /// </summary>
- /// <param name="context">The device context used to create the
FFT.</param>
- /// <param name="description">Information that describes the shape of
the FFT data as well as the scaling factors that should be used for forward
and inverse transforms.</param>
- FastFourierTransform( DeviceContext^ context,
FastFourierTransformDescription description );
-
- /// <summary>
- /// Initializes a new instance of the <see
cref="FastFourierTransform"/> class.
- /// </summary>
- /// <param name="context">The device context used to create the
FFT.</param>
- /// <param name="description">Information that describes the shape of
the FFT data as well as the scaling factors that should be used for forward
and inverse transforms.</param>
- /// <param name="flags">Flag affecting the behavior of the FFT.</param>
- FastFourierTransform( DeviceContext^ context,
FastFourierTransformDescription description,
FastFourierTransformCreationFlags flags );
-
- /// <summary>
- /// Creates a new one-dimensional complex FFT.
- /// </summary>
- /// <param name="context">The device context used to create the
FFT.</param>
- /// <param name="x">Length of the first dimension of the FFT.</param>
- /// <returns>The newly created FFT object.</returns>
- static FastFourierTransform^ Create1DComplex( DeviceContext^ context,
int x );
-
- /// <summary>
- /// Creates a new one-dimensional complex FFT.
- /// </summary>
- /// <param name="context">The device context used to create the
FFT.</param>
- /// <param name="x">Length of the first dimension of the FFT.</param>
- /// <param name="flags">Flag affecting the behavior of the FFT.</param>
- /// <returns>The newly created FFT object.</returns>
- static FastFourierTransform^ Create1DComplex( DeviceContext^ context,
int x, FastFourierTransformCreationFlags flags );
-
- /// <summary>
- /// Creates a new one-dimensional real FFT.
- /// </summary>
- /// <param name="context">The device context used to create the
FFT.</param>
- /// <param name="x">Length of the first dimension of the FFT.</param>
- /// <returns>The newly created FFT object.</returns>
- static FastFourierTransform^ Create1DReal( DeviceContext^ context, int
x );
-
- /// <summary>
- /// Creates a new one-dimensional real FFT.
- /// </summary>
- /// <param name="context">The device context used to create the
FFT.</param>
- /// <param name="x">Length of the first dimension of the FFT.</param>
- /// <param name="flags">Flag affecting the behavior of the FFT.</param>
- /// <returns>The newly created FFT object.</returns>
- static FastFourierTransform^ Create1DReal( DeviceContext^ context, int
x, FastFourierTransformCreationFlags flags );
-
- /// <summary>
- /// Creates a new two-dimensional complex FFT.
- /// </summary>
- /// <param name="context">The device context used to create the
FFT.</param>
- /// <param name="x">Length of the first dimension of the FFT.</param>
- /// <param name="y">Length of the second dimension of the FFT.</param>
- /// <returns>The newly created FFT object.</returns>
- static FastFourierTransform^ Create2DComplex( DeviceContext^ context,
int x, int y );
-
- /// <summary>
- /// Creates a new two-dimensional complex FFT.
- /// </summary>
- /// <param name="context">The device context used to create the
FFT.</param>
- /// <param name="x">Length of the first dimension of the FFT.</param>
- /// <param name="y">Length of the second dimension of the FFT.</param>
- /// <param name="flags">Flag affecting the behavior of the FFT.</param>
- /// <returns>The newly created FFT object.</returns>
- static FastFourierTransform^ Create2DComplex( DeviceContext^ context,
int x, int y, FastFourierTransformCreationFlags flags );
-
- /// <summary>
- /// Creates a new two-dimensional real FFT.
- /// </summary>
- /// <param name="context">The device context used to create the
FFT.</param>
- /// <param name="x">Length of the first dimension of the FFT.</param>
- /// <param name="y">Length of the second dimension of the FFT.</param>
- /// <returns>The newly created FFT object.</returns>
- static FastFourierTransform^ Create2DReal( DeviceContext^ context, int
x, int y );
-
- /// <summary>
- /// Creates a new two-dimensional real FFT.
- /// </summary>
- /// <param name="context">The device context used to create the
FFT.</param>
- /// <param name="x">Length of the first dimension of the FFT.</param>
- /// <param name="y">Length of the second dimension of the FFT.</param>
- /// <param name="flags">Flag affecting the behavior of the FFT.</param>
- /// <returns>The newly created FFT object.</returns>
- static FastFourierTransform^ Create2DReal( DeviceContext^ context, int
x, int y, FastFourierTransformCreationFlags flags );
-
- /// <summary>
- /// Creates a new three-dimensional complex FFT.
- /// </summary>
- /// <param name="context">The device context used to create the
FFT.</param>
- /// <param name="x">Length of the first dimension of the FFT.</param>
- /// <param name="y">Length of the second dimension of the FFT.</param>
- /// <param name="z">Length of the third dimension of the FFT.</param>
- /// <returns>The newly created FFT object.</returns>
- static FastFourierTransform^ Create3DComplex( DeviceContext^ context,
int x, int y, int z );
-
- /// <summary>
- /// Creates a new three-dimensional complex FFT.
- /// </summary>
- /// <param name="context">The device context used to create the
FFT.</param>
- /// <param name="x">Length of the first dimension of the FFT.</param>
- /// <param name="y">Length of the second dimension of the FFT.</param>
- /// <param name="z">Length of the third dimension of the FFT.</param>
- /// <param name="flags">Flag affecting the behavior of the FFT.</param>
- /// <returns>The newly created FFT object.</returns>
- static FastFourierTransform^ Create3DComplex( DeviceContext^ context,
int x, int y, int z, FastFourierTransformCreationFlags flags );
-
- /// <summary>
- /// Creates a new three-dimensional real FFT.
- /// </summary>
- /// <param name="context">The device context used to create the
FFT.</param>
- /// <param name="x">Length of the first dimension of the FFT.</param>
- /// <param name="y">Length of the second dimension of the FFT.</param>
- /// <param name="z">Length of the third dimension of the FFT.</param>
- /// <returns>The newly created FFT object.</returns>
- static FastFourierTransform^ Create3DReal( DeviceContext^ context, int
x, int y, int z );
-
- /// <summary>
- /// Creates a new three-dimensional real FFT.
- /// </summary>
- /// <param name="context">The device context used to create the
FFT.</param>
- /// <param name="x">Length of the first dimension of the FFT.</param>
- /// <param name="y">Length of the second dimension of the FFT.</param>
- /// <param name="z">Length of the third dimension of the FFT.</param>
- /// <param name="flags">Flag affecting the behavior of the FFT.</param>
- /// <returns>The newly created FFT object.</returns>
- static FastFourierTransform^ Create3DReal( DeviceContext^ context, int
x, int y, int z, FastFourierTransformCreationFlags flags );
-
- /// <summary>
- /// Gets the buffer requirements for the FFT.
- /// </summary>
- property FastFourierTransformBufferRequirements BufferRequirements
- {
- FastFourierTransformBufferRequirements get() { return
bufferRequirements; }
- }
-
- /// <summary>
- /// Gets or sets the forward scale of the FFT.
- /// </summary>
- property float ForwardScale
- {
- float get();
- void set(float value);
- }
-
- /// <summary>
- /// Gets or sets the inverse scale of the FFT.
- /// </summary>
- property float InverseScale
- {
- float get();
- void set(float value);
- }
-
- /// <summary>
- /// Attaches buffers to an FFT context and performs any required
precomputations.
- /// </summary>
- /// <param name="temporaryBuffers">Temporary buffers to attach.</param>
- /// <param name="precomputeBuffers">Buffers to hold precomputed
data.</param>
- /// <returns>A <see cref="SlimDX::Result"/> object describing the
result of the operation.</returns>
- Result AttachBuffersAndPrecompute( array<UnorderedAccessView^>^
temporaryBuffers, array<UnorderedAccessView^>^ precomputeBuffers );
-
- /// <summary>
- /// Performs a forward FFT.
- /// </summary>
- /// <param name="input">The input buffer.</param>
- /// <param name="output">The output buffer.</param>
- /// <returns>A <see cref="SlimDX::Result"/> object describing the
result of the operation.</returns>
- Result ForwardTransform( UnorderedAccessView^ input,
UnorderedAccessView^ output );
-
- /// <summary>
- /// Performs a forward FFT.
- /// </summary>
- /// <param name="input">The input buffer.</param>
- /// <returns>The last temporary buffer written to during the
operation.</returns>
- UnorderedAccessView^ ForwardTransform( UnorderedAccessView^ input );
-
- /// <summary>
- /// Performs an inverse FFT.
- /// </summary>
- /// <param name="input">The input buffer.</param>
- /// <param name="output">The output buffer.</param>
- /// <returns>A <see cref="SlimDX::Result"/> object describing the
result of the operation.</returns>
- Result InverseTransform( UnorderedAccessView^ input,
UnorderedAccessView^ output );
-
- /// <summary>
- /// Performs an inverse FFT.
- /// </summary>
- /// <param name="input">The input buffer.</param>
- /// <returns>The last temporary buffer written to during the
operation.</returns>
- UnorderedAccessView^ InverseTransform( UnorderedAccessView^ input );
- };
- }
-};
=======================================
---
/branches/lite/source/direct3d11/FastFourierTransformBufferRequirements11.cpp
Sat Jan 28 10:03:11 2012
+++ /dev/null
@@ -1,47 +0,0 @@
-/*
-* Copyright (c) 2007-2012 SlimDX Group
-*
-* Permission is hereby granted, free of charge, to any person obtaining a
copy
-* of this software and associated documentation files (the "Software"), to
deal
-* in the Software without restriction, including without limitation the
rights
-* to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
-* copies of the Software, and to permit persons to whom the Software is
-* furnished to do so, subject to the following conditions:
-*
-* The above copyright notice and this permission notice shall be included
in
-* all copies or substantial portions of the Software.
-*
-* THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS
OR
-* IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-* FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL
THE
-* AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
-* LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING
FROM,
-* OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
-* THE SOFTWARE.
-*/
-#include "stdafx.h"
-
-#include "FastFourierTransformBufferRequirements11.h"
-
-using namespace System;
-
-namespace SlimDX
-{
-namespace Direct3D11
-{
-
FastFourierTransformBufferRequirements::FastFourierTransformBufferRequirements(
const D3DX11_FFT_BUFFER_INFO &bufferInfo )
- {
- TemporaryBufferCount = bufferInfo.NumTempBufferSizes;
- PrecomputeBufferCount = bufferInfo.NumPrecomputeBufferSizes;
-
- TemporaryBufferSizes = gcnew array<int>(TemporaryBufferCount);
- PrecomputeBufferSizes = gcnew array<int>(PrecomputeBufferCount);
-
- for (int i = 0; i < TemporaryBufferCount; i++)
- TemporaryBufferSizes[i] = bufferInfo.TempBufferFloatSizes[i];
-
- for (int i = 0; i < PrecomputeBufferCount; i++)
- PrecomputeBufferSizes[i] = bufferInfo.PrecomputeBufferFloatSizes[i];
- }
-}
-}
=======================================
---
/branches/lite/source/direct3d11/FastFourierTransformBufferRequirements11.h
Sat Jan 28 10:03:11 2012
+++ /dev/null
@@ -1,61 +0,0 @@
-/*
-* Copyright (c) 2007-2012 SlimDX Group
-*
-* Permission is hereby granted, free of charge, to any person obtaining a
copy
-* of this software and associated documentation files (the "Software"), to
deal
-* in the Software without restriction, including without limitation the
rights
-* to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
-* copies of the Software, and to permit persons to whom the Software is
-* furnished to do so, subject to the following conditions:
-*
-* The above copyright notice and this permission notice shall be included
in
-* all copies or substantial portions of the Software.
-*
-* THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS
OR
-* IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-* FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL
THE
-* AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
-* LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING
FROM,
-* OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
-* THE SOFTWARE.
-*/
-#pragma once
-
-#include "Enums11.h"
-
-namespace SlimDX
-{
- namespace Direct3D11
- {
- /// <summary>
- /// Contains buffer requirements for an FFT.
- /// </summary>
- /// <unmanaged>D3DX11_FFT_BUFFER_INFO</unmanaged>
- public value class FastFourierTransformBufferRequirements
- {
- internal:
- FastFourierTransformBufferRequirements( const D3DX11_FFT_BUFFER_INFO
&bufferInfo );
-
- public:
- /// <summary>
- /// Number of temporary buffers needed.
- /// </summary>
- property int TemporaryBufferCount;
-
- /// <summary>
- /// Minimum sizes (in floats) of temporary buffers.
- /// </summary>
- property array<int>^ TemporaryBufferSizes;
-
- /// <summary>
- /// Number of precompute buffers required.
- /// </summary>
- property int PrecomputeBufferCount;
-
- /// <summary>
- /// Minimum sizes (in floats) for precompute buffers.
- /// </summary>
- property array<int>^ PrecomputeBufferSizes;
- };
- }
-};
=======================================
--- /branches/lite/source/direct3d11/FastFourierTransformDescription11.cpp
Sat Jan 28 10:03:11 2012
+++ /dev/null
@@ -1,46 +0,0 @@
-/*
-* Copyright (c) 2007-2012 SlimDX Group
-*
-* Permission is hereby granted, free of charge, to any person obtaining a
copy
-* of this software and associated documentation files (the "Software"), to
deal
-* in the Software without restriction, including without limitation the
rights
-* to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
-* copies of the Software, and to permit persons to whom the Software is
-* furnished to do so, subject to the following conditions:
-*
-* The above copyright notice and this permission notice shall be included
in
-* all copies or substantial portions of the Software.
-*
-* THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS
OR
-* IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-* FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL
THE
-* AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
-* LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING
FROM,
-* OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
-* THE SOFTWARE.
-*/
-#include "stdafx.h"
-
-#include "FastFourierTransformDescription11.h"
-
-using namespace System;
-
-namespace SlimDX
-{
-namespace Direct3D11
-{
- D3DX11_FFT_DESC FastFourierTransformDescription::ToUnmanaged()
- {
- D3DX11_FFT_DESC native;
-
- native.NumDimensions = DimensionCount;
- native.DimensionMask = static_cast<UINT>(Dimensions);
- native.Type = static_cast<D3DX11_FFT_DATA_TYPE>(DataType);
-
- for (int i = 0; i < ElementLengths->Length && i <
D3DX11_FFT_MAX_DIMENSIONS; i++)
- native.ElementLengths[i] = ElementLengths[i];
-
- return native;
- }
-}
-}
=======================================
--- /branches/lite/source/direct3d11/FastFourierTransformDescription11.h
Sat Jan 28 10:03:11 2012
+++ /dev/null
@@ -1,61 +0,0 @@
-/*
-* Copyright (c) 2007-2012 SlimDX Group
-*
-* Permission is hereby granted, free of charge, to any person obtaining a
copy
-* of this software and associated documentation files (the "Software"), to
deal
-* in the Software without restriction, including without limitation the
rights
-* to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
-* copies of the Software, and to permit persons to whom the Software is
-* furnished to do so, subject to the following conditions:
-*
-* The above copyright notice and this permission notice shall be included
in
-* all copies or substantial portions of the Software.
-*
-* THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS
OR
-* IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-* FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL
THE
-* AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
-* LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING
FROM,
-* OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
-* THE SOFTWARE.
-*/
-#pragma once
-
-#include "Enums11.h"
-
-namespace SlimDX
-{
- namespace Direct3D11
- {
- /// <summary>
- /// Contains a description for an FFT.
- /// </summary>
- /// <unmanaged>D3DX11_FFT_DESC</unmanaged>
- public value class FastFourierTransformDescription
- {
- internal:
- D3DX11_FFT_DESC ToUnmanaged();
-
- public:
- /// <summary>
- /// Number of dimension in the FFT.
- /// </summary>
- property int DimensionCount;
-
- /// <summary>
- /// Length of each dimension in the FFT.
- /// </summary>
- property array<int>^ ElementLengths;
-
- /// <summary>
- /// Combination of flags indicating the the dimensions to transform.
- /// </summary>
- property FastFourierTransformDimensions Dimensions;
-
- /// <summary>
- /// Flag indicating the type of data being transformed.
- /// </summary>
- property FastFourierTransformDataType DataType;
- };
- }
-};
=======================================
--- /branches/lite/source/direct3d11/ImageInformation11.cpp Sat Jan 28
10:03:11 2012
+++ /dev/null
@@ -1,236 +0,0 @@
-#include "stdafx.h"
-/*
-* Copyright (c) 2007-2012 SlimDX Group
-*
-* Permission is hereby granted, free of charge, to any person obtaining a
copy
-* of this software and associated documentation files (the "Software"), to
deal
-* in the Software without restriction, including without limitation the
rights
-* to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
-* copies of the Software, and to permit persons to whom the Software is
-* furnished to do so, subject to the following conditions:
-*
-* The above copyright notice and this permission notice shall be included
in
-* all copies or substantial portions of the Software.
-*
-* THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS
OR
-* IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-* FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL
THE
-* AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
-* LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING
FROM,
-* OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
-* THE SOFTWARE.
-*/
-
-#include <d3d11.h>
-#include <vcclr.h>
-
-#include "Direct3D11Exception.h"
-
-#include "ImageInformation11.h"
-
-using namespace System;
-
-namespace SlimDX
-{
- namespace Direct3D11
- {
- ImageInformation::ImageInformation( const D3DX11_IMAGE_INFO& native )
- {
- m_Width = native.Width;
- m_Height = native.Height;
- m_Depth = native.Depth;
- m_ArraySize = native.ArraySize;
- m_MipLevels = native.MipLevels;
- m_MiscFlags = static_cast<ResourceOptionFlags>( native.MiscFlags );
- m_Format = static_cast<DXGI::Format>( native.Format );
- m_Dimension = static_cast<ResourceDimension>( native.ResourceDimension
);
- m_FileFormat = static_cast<ImageFileFormat>( native.ImageFileFormat );
- }
-
- D3DX11_IMAGE_INFO ImageInformation::CreateNativeVersion()
- {
- D3DX11_IMAGE_INFO native;
- native.Width = m_Width;
- native.Height = m_Height;
- native.Depth = m_Depth;
- native.ArraySize = m_ArraySize;
- native.MipLevels = m_MipLevels;
- native.MiscFlags = static_cast<UINT>( m_MiscFlags );
- native.Format = static_cast<DXGI_FORMAT>( m_Format );
- native.ResourceDimension = static_cast<D3D11_RESOURCE_DIMENSION>(
m_Dimension );
- native.ImageFileFormat = static_cast<D3DX11_IMAGE_FILE_FORMAT>(
m_FileFormat );
-
- return native;
- }
-
- int ImageInformation::Width::get()
- {
- return m_Width;
- }
-
- void ImageInformation::Width::set( int value )
- {
- m_Width = value;
- }
-
- int ImageInformation::Height::get()
- {
- return m_Height;
- }
-
- void ImageInformation::Height::set( int value )
- {
- m_Height = value;
- }
-
- int ImageInformation::Depth::get()
- {
- return m_Depth;
- }
-
- void ImageInformation::Depth::set( int value )
- {
- m_Depth = value;
- }
-
- int ImageInformation::ArraySize::get()
- {
- return m_ArraySize;
- }
-
- void ImageInformation::ArraySize::set( int value )
- {
- m_ArraySize = value;
- }
-
- int ImageInformation::MipLevels::get()
- {
- return m_MipLevels;
- }
-
- void ImageInformation::MipLevels::set( int value )
- {
- m_MipLevels = value;
- }
-
- DXGI::Format ImageInformation::Format::get()
- {
- return m_Format;
- }
-
- void ImageInformation::Format::set( DXGI::Format value )
- {
- m_Format = value;
- }
-
- ResourceOptionFlags ImageInformation::OptionFlags::get()
- {
- return m_MiscFlags;
- }
-
- void ImageInformation::OptionFlags::set( ResourceOptionFlags value )
- {
- m_MiscFlags = value;
- }
-
- ResourceDimension ImageInformation::Dimension::get()
- {
- return m_Dimension;
- }
-
- void ImageInformation::Dimension::set( ResourceDimension value )
- {
- m_Dimension = value;
- }
-
- ImageFileFormat ImageInformation::FileFormat::get()
- {
- return m_FileFormat;
- }
-
- void ImageInformation::FileFormat::set( ImageFileFormat value )
- {
- m_FileFormat = value;
- }
-
- Nullable<ImageInformation> ImageInformation::FromFile( String^ fileName )
- {
- D3DX11_IMAGE_INFO info;
- pin_ptr<const wchar_t> pinnedName = PtrToStringChars( fileName );
- HRESULT hr = D3DX11GetImageInfoFromFile( pinnedName, 0, &info, 0 );
- if( RECORD_D3D11( hr ).IsFailure )
- return Nullable<ImageInformation>();
-
- return ImageInformation( info );
- }
-
- Nullable<ImageInformation> ImageInformation::FromMemory( array<Byte>^
memory )
- {
- D3DX11_IMAGE_INFO info;
- pin_ptr<unsigned char> pinnedMemory = &memory[0];
- HRESULT hr = D3DX11GetImageInfoFromMemory( pinnedMemory,
memory->Length, 0, &info, 0 );
- if( RECORD_D3D11( hr ).IsFailure )
- return Nullable<ImageInformation>();
-
- return ImageInformation( info );
- }
-
- bool ImageInformation::operator == ( ImageInformation left,
ImageInformation right )
- {
- return ImageInformation::Equals( left, right );
- }
-
- bool ImageInformation::operator != ( ImageInformation left,
ImageInformation right )
- {
- return !ImageInformation::Equals( left, right );
- }
-
- int ImageInformation::GetHashCode()
- {
- return m_Width.GetHashCode() + m_Height.GetHashCode() +
m_Depth.GetHashCode()
- + m_ArraySize.GetHashCode() + m_MipLevels.GetHashCode() +
m_MiscFlags.GetHashCode()
- + m_Format.GetHashCode() + m_Dimension.GetHashCode() +
m_FileFormat.GetHashCode();
- }
-
- bool ImageInformation::Equals( Object^ value )
- {
- if( value == nullptr )
- return false;
-
- if( value->GetType() != GetType() )
- return false;
-
- return Equals( safe_cast<ImageInformation>( value ) );
- }
-
- bool ImageInformation::Equals( ImageInformation value )
- {
- return (
- m_Width == value.m_Width &&
- m_Height == value.m_Height &&
- m_Depth == value.m_Depth &&
- m_ArraySize == value.m_ArraySize &&
- m_MipLevels == value.m_MipLevels &&
- m_MiscFlags == value.m_MiscFlags &&
- m_Format == value.m_Format &&
- m_Dimension == value.m_Dimension &&
- m_FileFormat == value.m_FileFormat
- );
- }
-
- bool ImageInformation::Equals( ImageInformation% value1,
ImageInformation% value2 )
- {
- return (
- value1.m_Width == value2.m_Width &&
- value1.m_Height == value2.m_Height &&
- value1.m_Depth == value2.m_Depth &&
- value1.m_ArraySize == value2.m_ArraySize &&
- value1.m_MipLevels == value2.m_MipLevels &&
- value1.m_MiscFlags == value2.m_MiscFlags &&
- value1.m_Format == value2.m_Format &&
- value1.m_Dimension == value2.m_Dimension &&
- value1.m_FileFormat == value2.m_FileFormat
- );
- }
- }
-}
=======================================
--- /branches/lite/source/direct3d11/ImageInformation11.h Sat Jan 28
10:03:11 2012
+++ /dev/null
@@ -1,197 +0,0 @@
-/*
-* Copyright (c) 2007-2012 SlimDX Group
-*
-* Permission is hereby granted, free of charge, to any person obtaining a
copy
-* of this software and associated documentation files (the "Software"), to
deal
-* in the Software without restriction, including without limitation the
rights
-* to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
-* copies of the Software, and to permit persons to whom the Software is
-* furnished to do so, subject to the following conditions:
-*
-* The above copyright notice and this permission notice shall be included
in
-* all copies or substantial portions of the Software.
-*
-* THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS
OR
-* IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-* FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL
THE
-* AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
-* LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING
FROM,
-* OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
-* THE SOFTWARE.
-*/
-#pragma once
-
-#include "../dxgi/Enums.h"
-
-#include "Enums11.h"
-
-namespace SlimDX
-{
- namespace Direct3D11
- {
- /// <summary>
- /// Contains the description of the contents of an image file.
- /// </summary>
- /// <unmanaged>D3DX11_IMAGE_INFO</unmanaged>
- [System::Runtime::InteropServices::StructLayout(
System::Runtime::InteropServices::LayoutKind::Sequential )]
- public value class ImageInformation :
System::IEquatable<ImageInformation>
- {
- private:
- int m_Width;
- int m_Height;
- int m_Depth;
- int m_ArraySize;
- int m_MipLevels;
- ResourceOptionFlags m_MiscFlags;
- DXGI::Format m_Format;
- ResourceDimension m_Dimension;
- ImageFileFormat m_FileFormat;
-
- internal:
- ImageInformation( const D3DX11_IMAGE_INFO& native );
-
- D3DX11_IMAGE_INFO CreateNativeVersion();
-
- public:
- /// <summary>
- /// Width of the original image, in pixels.
- /// </summary>
- property int Width
- {
- int get();
- void set( int value );
- }
-
- /// <summary>
- /// Height of the original image, in pixels.
- /// </summary>
- property int Height
- {
- int get();
- void set( int value );
- }
-
- /// <summary>
- /// Depth of the original image, in pixels.
- /// </summary>
- property int Depth
- {
- int get();
- void set( int value );
- }
-
- /// <summary>
- /// Size of the image, in bytes.
- /// </summary>
- property int ArraySize
- {
- int get();
- void set( int value );
- }
-
- /// <summary>
- /// Number of mipmap levels in the original image.
- /// </summary>
- property int MipLevels
- {
- int get();
- void set( int value );
- }
-
- /// <summary>
- /// Flags that identifies other, less common resource options.
- /// </summary>
- property ResourceOptionFlags OptionFlags
- {
- ResourceOptionFlags get();
- void set( ResourceOptionFlags value );
- }
-
- /// <summary>
- /// The original format of the image.
- /// </summary>
- property DXGI::Format Format
- {
- DXGI::Format get();
- void set( DXGI::Format value );
- }
-
- /// <summary>
- /// The type of the texture stored in the file.
- /// </summary>
- property ResourceDimension Dimension
- {
- ResourceDimension get();
- void set( ResourceDimension value );
- }
-
- /// <summary>
- /// The format of the image file.
- /// </summary>
- property ImageFileFormat FileFormat
- {
- ImageFileFormat get();
- void set( ImageFileFormat value );
- }
-
- /// <summary>
- /// Loads information about the given image file.
- /// </summary>
- /// <param name="fileName">Name of the image file.</param>
- /// <returns>An <see cref="ImageInformation" /> instance containing
information about the image file, or <c>null</c> if the file cannot be
loaded.</returns>
- static System::Nullable<ImageInformation> FromFile( System::String^
fileName );
-
- /// <summary>
- /// Loads information about the given image file in memory.
- /// </summary>
- /// <param name="memory">An array of memory containing the image
file.</param>
- /// <returns>An <see cref="ImageInformation" /> instance containing
information about the image file, or <c>null</c> if the file cannot be
loaded.</returns>
- static System::Nullable<ImageInformation> FromMemory(
array<System::Byte>^ memory );
-
- /// <summary>
- /// Tests for equality between two objects.
- /// </summary>
- /// <param name="left">The first value to compare.</param>
- /// <param name="right">The second value to compare.</param>
- /// <returns><c>true</c> if <paramref name="left"/> has the same value
as <paramref name="right"/>; otherwise, <c>false</c>.</returns>
- static bool operator == ( ImageInformation left, ImageInformation right
);
-
- /// <summary>
- /// Tests for inequality between two objects.
- /// </summary>
- /// <param name="left">The first value to compare.</param>
- /// <param name="right">The second value to compare.</param>
- /// <returns><c>true</c> if <paramref name="left"/> has a different
value than <paramref name="right"/>; otherwise, <c>false</c>.</returns>
- static bool operator != ( ImageInformation left, ImageInformation right
);
-
- /// <summary>
- /// Returns the hash code for this instance.
- /// </summary>
- /// <returns>A 32-bit signed integer hash code.</returns>
- virtual int GetHashCode() override;
-
- /// <summary>
- /// Returns a value that indicates whether the current instance is
equal to a specified object.
- /// </summary>
- /// <param name="obj">Object to make the comparison with.</param>
- /// <returns><c>true</c> if the current instance is equal to the
specified object; <c>false</c> otherwise.</returns>
- virtual bool Equals( System::Object^ obj ) override;
-
- /// <summary>
- /// Returns a value that indicates whether the current instance is
equal to the specified object.
- /// </summary>
- /// <param name="other">Object to make the comparison with.</param>
- /// <returns><c>true</c> if the current instance is equal to the
specified object; <c>false</c> otherwise.</returns>
- virtual bool Equals( ImageInformation other );
-
- /// <summary>
- /// Determines whether the specified object instances are considered
equal.
- /// </summary>
- /// <param name="value1">The first value to compare.</param>
- /// <param name="value2">The second value to compare.</param>
- /// <returns><c>true</c> if <paramref name="value1"/> is the same
instance as <paramref name="value2"/> or
- /// if both are <c>null</c> references or if
<c>value1.Equals(value2)</c> returns <c>true</c>; otherwise,
<c>false</c>.</returns>
- static bool Equals( ImageInformation% value1, ImageInformation% value2
);
- };
- }
-}
=======================================
--- /branches/lite/source/direct3d11/ImageLoadInformation11.cpp Sat Jan 28
10:03:11 2012
+++ /dev/null
@@ -1,275 +0,0 @@
-#include "stdafx.h"
-/*
-* Copyright (c) 2007-2012 SlimDX Group
-*
-* Permission is hereby granted, free of charge, to any person obtaining a
copy
-* of this software and associated documentation files (the "Software"), to
deal
-* in the Software without restriction, including without limitation the
rights
-* to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
-* copies of the Software, and to permit persons to whom the Software is
-* furnished to do so, subject to the following conditions:
-*
-* The above copyright notice and this permission notice shall be included
in
-* all copies or substantial portions of the Software.
-*
-* THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS
OR
-* IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-* FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL
THE
-* AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
-* LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING
FROM,
-* OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
-* THE SOFTWARE.
-*/
-
-#include <d3d11.h>
-
-#include "ImageLoadInformation11.h"
-
-namespace SlimDX
-{
- namespace Direct3D11
- {
- ImageLoadInformation::ImageLoadInformation( const
D3DX11_IMAGE_LOAD_INFO& native )
- {
- m_Width = native.Width;
- m_Height = native.Height;
- m_Depth = native.Depth;
- m_FirstMipLevel = native.FirstMipLevel;
- m_MipLevels = native.MipLevels;
- m_Usage = static_cast<ResourceUsage>( native.Usage );
- m_BindFlags = static_cast<Direct3D11::BindFlags>( native.BindFlags );
- m_CPUAccessFlags = static_cast<Direct3D11::CpuAccessFlags>(
native.CpuAccessFlags );
- m_MiscFlags = static_cast<ResourceOptionFlags>( native.MiscFlags );
- m_Format = static_cast<DXGI::Format>( native.Format );
- m_Filter = static_cast<Direct3D11::FilterFlags>( native.Filter );
- m_MipFilter = static_cast<Direct3D11::FilterFlags>( native.MipFilter );
- }
-
- D3DX11_IMAGE_LOAD_INFO ImageLoadInformation::CreateNativeVersion()
- {
- D3DX11_IMAGE_LOAD_INFO native;
- native.Width = m_Width;
- native.Height = m_Height;
- native.Depth = m_Depth;
- native.FirstMipLevel = m_FirstMipLevel;
- native.MipLevels = m_MipLevels;
- native.Usage = static_cast<D3D11_USAGE>( m_Usage );
- native.BindFlags = static_cast<UINT>( m_BindFlags );
- native.CpuAccessFlags = static_cast<UINT>( m_CPUAccessFlags );
- native.MiscFlags = static_cast<UINT>( m_MiscFlags );
- native.Format = static_cast<DXGI_FORMAT>( m_Format );
- native.Filter = static_cast<D3DX11_FILTER_FLAG>( m_Filter );
- native.MipFilter = static_cast<D3DX11_FILTER_FLAG>( m_MipFilter );
-
- return native;
- }
-
- ImageLoadInformation ImageLoadInformation::FromDefaults()
- {
- ImageLoadInformation ret;
- ret.m_Width = D3DX11_DEFAULT;
- ret.m_Height = D3DX11_DEFAULT;
- ret.m_Depth = D3DX11_DEFAULT;
- ret.m_FirstMipLevel = D3DX11_DEFAULT;
- ret.m_MipLevels = D3DX11_DEFAULT;
- ret.m_Usage = static_cast<ResourceUsage>( D3DX11_DEFAULT );
- ret.m_BindFlags = static_cast<Direct3D11::BindFlags>( D3DX11_DEFAULT );
- ret.m_CPUAccessFlags = static_cast<Direct3D11::CpuAccessFlags>(
D3DX11_DEFAULT );
- ret.m_MiscFlags = static_cast<ResourceOptionFlags>( D3DX11_DEFAULT );
- ret.m_Format = static_cast<DXGI::Format>( D3DX11_DEFAULT );
- ret.m_Filter = static_cast<Direct3D11::FilterFlags>( D3DX11_DEFAULT );
- ret.m_MipFilter = static_cast<Direct3D11::FilterFlags>( D3DX11_DEFAULT
);
- return ret;
- }
-
- int ImageLoadInformation::FileDefaultValue::get()
- {
- return D3DX11_DEFAULT;
- }
-
- int ImageLoadInformation::Width::get()
- {
- return m_Width;
- }
-
- void ImageLoadInformation::Width::set( int value )
- {
- m_Width = value;
- }
-
- int ImageLoadInformation::Height::get()
- {
- return m_Height;
- }
-
- void ImageLoadInformation::Height::set( int value )
- {
- m_Height = value;
- }
-
- int ImageLoadInformation::Depth::get()
- {
- return m_Depth;
- }
-
- void ImageLoadInformation::Depth::set( int value )
- {
- m_Depth = value;
- }
-
- int ImageLoadInformation::FirstMipLevel::get()
- {
- return m_FirstMipLevel;
- }
-
- void ImageLoadInformation::FirstMipLevel::set( int value )
- {
- m_FirstMipLevel = value;
- }
-
- int ImageLoadInformation::MipLevels::get()
- {
- return m_MipLevels;
- }
-
- void ImageLoadInformation::MipLevels::set( int value )
- {
- m_MipLevels = value;
- }
-
- ResourceUsage ImageLoadInformation::Usage::get()
- {
- return m_Usage;
- }
-
- void ImageLoadInformation::Usage::set( ResourceUsage value )
- {
- m_Usage = value;
- }
-
- Direct3D11::BindFlags ImageLoadInformation::BindFlags::get()
- {
- return m_BindFlags;
- }
-
- void ImageLoadInformation::BindFlags::set( Direct3D11::BindFlags value )
- {
- m_BindFlags = value;
- }
-
- Direct3D11::CpuAccessFlags ImageLoadInformation::CpuAccessFlags::get()
- {
- return m_CPUAccessFlags;
- }
-
- void ImageLoadInformation::CpuAccessFlags::set(
Direct3D11::CpuAccessFlags value )
- {
- m_CPUAccessFlags = value;
- }
-
- ResourceOptionFlags ImageLoadInformation::OptionFlags::get()
- {
- return m_MiscFlags;
- }
-
- void ImageLoadInformation::OptionFlags::set( ResourceOptionFlags value )
- {
- m_MiscFlags = value;
- }
-
- DXGI::Format ImageLoadInformation::Format::get()
- {
- return m_Format;
- }
-
- void ImageLoadInformation::Format::set( DXGI::Format value )
- {
- m_Format = value;
- }
-
- Direct3D11::FilterFlags ImageLoadInformation::FilterFlags::get()
- {
- return m_Filter;
- }
-
- void ImageLoadInformation::FilterFlags::set( Direct3D11::FilterFlags
value )
- {
- m_Filter = value;
- }
-
- Direct3D11::FilterFlags ImageLoadInformation::MipFilterFlags::get()
- {
- return m_MipFilter;
- }
-
- void ImageLoadInformation::MipFilterFlags::set( Direct3D11::FilterFlags
value )
- {
- m_MipFilter = value;
- }
-
- bool ImageLoadInformation::operator == ( ImageLoadInformation left,
ImageLoadInformation right )
- {
- return ImageLoadInformation::Equals( left, right );
- }
-
- bool ImageLoadInformation::operator != ( ImageLoadInformation left,
ImageLoadInformation right )
- {
- return !ImageLoadInformation::Equals( left, right );
- }
-
- int ImageLoadInformation::GetHashCode()
- {
- return m_Width.GetHashCode() + m_Height.GetHashCode() +
m_Depth.GetHashCode()
- + m_FirstMipLevel.GetHashCode() + m_MipLevels.GetHashCode()
- + m_Usage.GetHashCode() + m_BindFlags.GetHashCode() +
m_CPUAccessFlags.GetHashCode() + m_MiscFlags.GetHashCode()
- + m_Format.GetHashCode() + m_Filter.GetHashCode() +
m_MipFilter.GetHashCode();
- }
-
- bool ImageLoadInformation::Equals( Object^ value )
- {
- if( value == nullptr )
- return false;
-
- if( value->GetType() != GetType() )
- return false;
-
- return Equals( safe_cast<ImageLoadInformation>( value ) );
- }
-
- bool ImageLoadInformation::Equals( ImageLoadInformation value )
- {
- return (
- m_Width == value.m_Width &&
- m_Height == value.m_Height &&
- m_Depth == value.m_Depth &&
- m_FirstMipLevel == value.m_FirstMipLevel &&
- m_MipLevels == value.m_MipLevels &&
- m_Usage == value.m_Usage &&
- m_BindFlags == value.m_BindFlags &&
- m_CPUAccessFlags == value.m_CPUAccessFlags &&
- m_MiscFlags == value.m_MiscFlags &&
- m_Format == value.m_Format &&
- m_Filter == value.m_Filter &&
- m_MipFilter == value.m_MipFilter
- );
- }
-
- bool ImageLoadInformation::Equals( ImageLoadInformation% value1,
ImageLoadInformation% value2 )
- {
- return (
- value1.m_Width == value2.m_Width &&
- value1.m_Height == value2.m_Height &&
- value1.m_Depth == value2.m_Depth &&
- value1.m_FirstMipLevel == value2.m_FirstMipLevel &&
- value1.m_MipLevels == value2.m_MipLevels &&
- value1.m_Usage == value2.m_Usage &&
- value1.m_BindFlags == value2.m_BindFlags &&
- value1.m_CPUAccessFlags == value2.m_CPUAccessFlags &&
- value1.m_MiscFlags == value2.m_MiscFlags &&
- value1.m_Format == value2.m_Format &&
- value1.m_Filter == value2.m_Filter &&
- value1.m_MipFilter == value2.m_MipFilter
- );
- }
- }
-}
=======================================
--- /branches/lite/source/direct3d11/ImageLoadInformation11.h Sat Jan 28
10:03:11 2012
+++ /dev/null
@@ -1,228 +0,0 @@
-/*
-* Copyright (c) 2007-2012 SlimDX Group
-*
-* Permission is hereby granted, free of charge, to any person obtaining a
copy
-* of this software and associated documentation files (the "Software"), to
deal
-* in the Software without restriction, including without limitation the
rights
-* to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
-* copies of the Software, and to permit persons to whom the Software is
-* furnished to do so, subject to the following conditions:
-*
-* The above copyright notice and this permission notice shall be included
in
-* all copies or substantial portions of the Software.
-*
-* THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS
OR
-* IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-* FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL
THE
-* AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
-* LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING
FROM,
-* OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
-* THE SOFTWARE.
-*/
-#pragma once
-
-#include "../dxgi/Enums.h"
-
-#include "Enums11.h"
-
-namespace SlimDX
-{
- namespace Direct3D11
- {
- /// <summary>
- /// Contains the description of the contents of an image file.
- /// </summary>
- /// <unmanaged>D3DX11_IMAGE_LOAD_INFO</unmanaged>
- [System::Runtime::InteropServices::StructLayout(
System::Runtime::InteropServices::LayoutKind::Sequential )]
- public value class ImageLoadInformation :
System::IEquatable<ImageLoadInformation>
- {
- private:
- int m_Width;
- int m_Height;
- int m_Depth;
- int m_FirstMipLevel;
- int m_MipLevels;
- ResourceUsage m_Usage;
- BindFlags m_BindFlags;
- CpuAccessFlags m_CPUAccessFlags;
- ResourceOptionFlags m_MiscFlags;
- DXGI::Format m_Format;
- FilterFlags m_Filter;
- FilterFlags m_MipFilter;
-
- internal:
- ImageLoadInformation( const D3DX11_IMAGE_LOAD_INFO& native );
-
- D3DX11_IMAGE_LOAD_INFO CreateNativeVersion();
-
- public:
- /// <summary>
- /// Initializes a new instance of the <see
cref="ImageLoadInformation"/> struct using default values.
- /// </summary>
- /// <returns>The default image load information.</returns>
- static ImageLoadInformation FromDefaults();
-
- /// <summary>
- /// The default value for load options.
- /// </summary>
- property static int FileDefaultValue
- {
- int get();
- }
-
- /// <summary>
- /// Width of the original image, in pixels.
- /// </summary>
- property int Width
- {
- int get();
- void set( int value );
- }
-
- /// <summary>
- /// Height of the original image, in pixels.
- /// </summary>
- property int Height
- {
- int get();
- void set( int value );
- }
-
- /// <summary>
- /// Depth of the original image, in pixels.
- /// </summary>
- property int Depth
- {
- int get();
- void set( int value );
- }
-
- /// <summary>
- /// The highest resolution mipmap level of the texture; if greater than
zero,
- /// this mipmap level will be mapped to level 0 in the loaded texture.
- /// </summary>
- property int FirstMipLevel
- {
- int get();
- void set( int value );
- }
-
- /// <summary>
- /// Number of mipmap levels in the original image.
- /// </summary>
- property int MipLevels
- {
- int get();
- void set( int value );
- }
-
- /// <summary>
- /// Gets or sets the intended usage pattern of the loaded texture.
- /// </summary>
- property ResourceUsage Usage
- {
- ResourceUsage get();
- void set( ResourceUsage value );
- }
-
- /// <summary>
- /// Gets or sets the flags specifying how the loaded texture is bound
to the pipeline.
- /// </summary>
- property Direct3D11::BindFlags BindFlags
- {
- Direct3D11::BindFlags get();
- void set( Direct3D11::BindFlags value );
- }
-
- /// <summary>
- /// Gets or sets the flags specifying how the CPU will be allowed to
access the loaded texture.
- /// </summary>
- property Direct3D11::CpuAccessFlags CpuAccessFlags
- {
- Direct3D11::CpuAccessFlags get();
- void set( Direct3D11::CpuAccessFlags value );
- }
-
- /// <summary>
- /// Gets or sets the flags specifying miscellaneous resource options.
- /// </summary>
- property ResourceOptionFlags OptionFlags
- {
- ResourceOptionFlags get();
- void set( ResourceOptionFlags value );
- }
-
- /// <summary>
- /// The format of the loaded texture.
- /// </summary>
- property DXGI::Format Format
- {
- DXGI::Format get();
- void set( DXGI::Format value );
- }
-
- /// <summary>
- /// The filter used when resampling the texture.
- /// </summary>
- property Direct3D11::FilterFlags FilterFlags
- {
- Direct3D11::FilterFlags get();
- void set( Direct3D11::FilterFlags value );
- }
-
- /// <summary>
- /// The filter used when resampling mipmap levels of the texture.
- /// </summary>
- property Direct3D11::FilterFlags MipFilterFlags
- {
- Direct3D11::FilterFlags get();
- void set( Direct3D11::FilterFlags value );
- }
-
- /// <summary>
- /// Tests for equality between two objects.
- /// </summary>
- /// <param name="left">The first value to compare.</param>
- /// <param name="right">The second value to compare.</param>
- /// <returns><c>true</c> if <paramref name="left"/> has the same value
as <paramref name="right"/>; otherwise, <c>false</c>.</returns>
- static bool operator == ( ImageLoadInformation left,
ImageLoadInformation right );
-
- /// <summary>
- /// Tests for inequality between two objects.
- /// </summary>
- /// <param name="left">The first value to compare.</param>
- /// <param name="right">The second value to compare.</param>
- /// <returns><c>true</c> if <paramref name="left"/> has a different
value than <paramref name="right"/>; otherwise, <c>false</c>.</returns>
- static bool operator != ( ImageLoadInformation left,
ImageLoadInformation right );
-
- /// <summary>
- /// Returns the hash code for this instance.
- /// </summary>
- /// <returns>A 32-bit signed integer hash code.</returns>
- virtual int GetHashCode() override;
-
- /// <summary>
- /// Returns a value that indicates whether the current instance is
equal to a specified object.
- /// </summary>
- /// <param name="obj">Object to make the comparison with.</param>
- /// <returns><c>true</c> if the current instance is equal to the
specified object; <c>false</c> otherwise.</returns>
- virtual bool Equals( System::Object^ obj ) override;
-
- /// <summary>
- /// Returns a value that indicates whether the current instance is
equal to the specified object.
- /// </summary>
- /// <param name="other">Object to make the comparison with.</param>
- /// <returns><c>true</c> if the current instance is equal to the
specified object; <c>false</c> otherwise.</returns>
- virtual bool Equals( ImageLoadInformation other );
-
- /// <summary>
- /// Determines whether the specified object instances are considered
equal.
- /// </summary>
- /// <param name="value1">The first value to compare.</param>
- /// <param name="value2">The second value to compare.</param>
- /// <returns><c>true</c> if <paramref name="value1"/> is the same
instance as <paramref name="value2"/> or
- /// if both are <c>null</c> references or if
<c>value1.Equals(value2)</c> returns <c>true</c>; otherwise,
<c>false</c>.</returns>
- static bool Equals( ImageLoadInformation% value1, ImageLoadInformation%
value2 );
- };
- }
-}
=======================================
--- /branches/lite/source/direct3d11/Scan11.cpp Sat Jan 28 10:03:11 2012
+++ /dev/null
@@ -1,73 +0,0 @@
-/*
-* Copyright (c) 2007-2012 SlimDX Group
-*
-* Permission is hereby granted, free of charge, to any person obtaining a
copy
-* of this software and associated documentation files (the "Software"), to
deal
-* in the Software without restriction, including without limitation the
rights
-* to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
-* copies of the Software, and to permit persons to whom the Software is
-* furnished to do so, subject to the following conditions:
-*
-* The above copyright notice and this permission notice shall be included
in
-* all copies or substantial portions of the Software.
-*
-* THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS
OR
-* IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-* FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL
THE
-* AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
-* LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING
FROM,
-* OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
-* THE SOFTWARE.
-*/
-#include "stdafx.h"
-
-#include "Direct3D11Exception.h"
-#include "DeviceContext11.h"
-#include "UnorderedAccessView11.h"
-
-#include "Scan11.h"
-
-using namespace System;
-
-namespace SlimDX
-{
-namespace Direct3D11
-{
- Scan::Scan( DeviceContext^ deviceContext, int maxElementScanSize, int
maxScanCount )
- {
- if (deviceContext == nullptr)
- throw gcnew System::ArgumentNullException( "deviceContext" );
-
- ID3DX11Scan* nativeScan;
- HRESULT hr = D3DX11CreateScan( deviceContext->InternalPointer,
maxElementScanSize, maxScanCount, &nativeScan );
- if (RECORD_D3D11( hr ).IsFailure)
- throw gcnew Direct3D11Exception( Result::Last );
-
- Construct( nativeScan );
- }
-
- Result Scan::SetScanDirection( ScanDirection value )
- {
- HRESULT hr = InternalPointer->SetScanDirection(
static_cast<D3DX11_SCAN_DIRECTION>( value ) );
- return RECORD_D3D11( hr );
- }
-
- Result Scan::PerformScan( ScanDataType elementType, ScanOpCode operation,
int numberOfElements, UnorderedAccessView^ src, UnorderedAccessView^ dest )
- {
- ID3D11UnorderedAccessView* nativeSrc = src == nullptr ? NULL :
src->InternalPointer;
- ID3D11UnorderedAccessView* nativeDest = dest == nullptr ? NULL :
dest->InternalPointer;
-
- HRESULT hr = InternalPointer->Scan( static_cast<D3DX11_SCAN_DATA_TYPE>(
elementType ), static_cast<D3DX11_SCAN_OPCODE>( operation ),
numberOfElements, nativeSrc, nativeDest );
- return RECORD_D3D11( hr );
- }
-
- Result Scan::PerformMultiscan( ScanDataType elementType, ScanOpCode
operation, int numberOfElements, int scanPitchInElements, int scanCount,
UnorderedAccessView^ src, UnorderedAccessView^ dest )
- {
- ID3D11UnorderedAccessView* nativeSrc = src == nullptr ? NULL :
src->InternalPointer;
- ID3D11UnorderedAccessView* nativeDest = dest == nullptr ? NULL :
dest->InternalPointer;
-
- HRESULT hr = InternalPointer->Multiscan(
static_cast<D3DX11_SCAN_DATA_TYPE>( elementType ),
static_cast<D3DX11_SCAN_OPCODE>( operation ), numberOfElements,
scanPitchInElements, scanCount, nativeSrc, nativeDest );
- return RECORD_D3D11( hr );
- }
-}
-}
=======================================
--- /branches/lite/source/direct3d11/Scan11.h Sat Jan 28 10:03:11 2012
+++ /dev/null
@@ -1,88 +0,0 @@
-/*
-* Copyright (c) 2007-2012 SlimDX Group
-*
-* Permission is hereby granted, free of charge, to any person obtaining a
copy
-* of this software and associated documentation files (the "Software"), to
deal
-* in the Software without restriction, including without limitation the
rights
-* to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
-* copies of the Software, and to permit persons to whom the Software is
-* furnished to do so, subject to the following conditions:
-*
-* The above copyright notice and this permission notice shall be included
in
-* all copies or substantial portions of the Software.
-*
-* THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS
OR
-* IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-* FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL
THE
-* AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
-* LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING
FROM,
-* OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
-* THE SOFTWARE.
-*/
-#pragma once
-
-#include "../ComObject.h"
-
-#include "../dxgi/Enums.h"
-
-#include "../ComObject.h"
-
-#include "Enums11.h"
-
-namespace SlimDX
-{
- namespace Direct3D11
- {
- ref class DeviceContext;
- ref class UnorderedAccessView;
-
- /// <summary>
- /// Represents a scan context.
- /// </summary>
- /// <unmanaged>ID3DX11Scan</unmanaged>
- public ref class Scan : public ComObject
- {
- COMOBJECT(ID3DX11Scan, Scan);
-
- public:
- /// <summary>
- /// Initializes a new instance of the <see cref="Scan"/> class.
- /// </summary>
- /// <param name="deviceContext">The device context with which to
associate the scan object.</param>
- /// <param name="maxElementScanSize">Maximum single scan size, in
elements.</param>
- /// <param name="maxScanCount">Maximum number of scans in
multiscan.</param>
- Scan( DeviceContext^ deviceContext, int maxElementScanSize, int
maxScanCount );
-
- /// <summary>
- /// Sets the scan direction.
- /// </summary>
- /// <param name="direction">The direction in which to perform the
scans.</param>
- /// <returns>A <see cref="SlimDX::Result"/> object describing the
result of the operation.</returns>
- Result SetScanDirection( ScanDirection direction );
-
- /// <summary>
- /// Performs an unsegmented scan of a sequence.
- /// </summary>
- /// <param name="elementType">The type of element in the
sequence.</param>
- /// <param name="operation">The binary operation to perform.</param>
- /// <param name="elementCount">Size of scan in elements.</param>
- /// <param name="source">Input sequence on the device. Set <paramref
name="source"/> and <paramref name="destination"/> to the same value for
in-place scans.</param>
- /// <param name="destination">Output sequence on the device.</param>
- /// <returns>A <see cref="SlimDX::Result"/> object describing the
result of the operation.</returns>
- Result PerformScan( ScanDataType elementType, ScanOpCode operation, int
elementCount, UnorderedAccessView^ source, UnorderedAccessView^ destination
);
-
- /// <summary>
- /// Performs a multiscan of a sequence.
- /// </summary>
- /// <param name="elementType">The type of element in the
sequence.</param>
- /// <param name="operation">The binary operation to perform.</param>
- /// <param name="elementCount">Size of scan in elements.</param>
- /// <param name="scanPitchInElements">Pitch of the next scan in
elements.</param>
- /// <param name="scanCount">Number of scans in the multiscan.</param>
- /// <param name="source">Input sequence on the device. Set <paramref
name="source"/> and <paramref name="destination"/> to the same value for
in-place scans.</param>
- /// <param name="destination">Output sequence on the device.</param>
- /// <returns>A <see cref="SlimDX::Result"/> object describing the
result of the operation.</returns>
- Result PerformMultiscan( ScanDataType elementType, ScanOpCode
operation, int elementCount, int scanPitchInElements, int scanCount,
UnorderedAccessView^ source, UnorderedAccessView^ destination );
- };
- }
-};
=======================================
--- /branches/lite/source/direct3d11/SegmentedScan11.cpp Sat Jan 28
10:03:11 2012
+++ /dev/null
@@ -1,65 +0,0 @@
-/*
-* Copyright (c) 2007-2012 SlimDX Group
-*
-* Permission is hereby granted, free of charge, to any person obtaining a
copy
-* of this software and associated documentation files (the "Software"), to
deal
-* in the Software without restriction, including without limitation the
rights
-* to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
-* copies of the Software, and to permit persons to whom the Software is
-* furnished to do so, subject to the following conditions:
-*
-* The above copyright notice and this permission notice shall be included
in
-* all copies or substantial portions of the Software.
-*
-* THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS
OR
-* IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-* FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL
THE
-* AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
-* LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING
FROM,
-* OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
-* THE SOFTWARE.
-*/
-#include "stdafx.h"
-
-#include "Direct3D11Exception.h"
-#include "DeviceContext11.h"
-#include "UnorderedAccessView11.h"
-
-#include "SegmentedScan11.h"
-
-using namespace System;
-
-namespace SlimDX
-{
-namespace Direct3D11
-{
- SegmentedScan::SegmentedScan( DeviceContext^ deviceContext, int
maxElementScanSize )
- {
- if (deviceContext == nullptr)
- throw gcnew System::ArgumentNullException( "deviceContext" );
-
- ID3DX11SegmentedScan* nativeScan;
- HRESULT hr = D3DX11CreateSegmentedScan( deviceContext->InternalPointer,
maxElementScanSize, &nativeScan );
- if (RECORD_D3D11( hr ).IsFailure)
- throw gcnew Direct3D11Exception( Result::Last );
-
- Construct( nativeScan );
- }
-
- Result SegmentedScan::SetScanDirection( ScanDirection value )
- {
- HRESULT hr = InternalPointer->SetScanDirection(
static_cast<D3DX11_SCAN_DIRECTION>( value ) );
- return RECORD_D3D11( hr );
- }
-
- Result SegmentedScan::PerformSegmentedScan( ScanDataType elementType,
ScanOpCode operation, int numberOfElements, UnorderedAccessView^ src,
UnorderedAccessView^ srcElementFlags, UnorderedAccessView^ dest )
- {
- ID3D11UnorderedAccessView* nativeSrc = src == nullptr ? NULL :
src->InternalPointer;
- ID3D11UnorderedAccessView* nativeSrcElementFlags = srcElementFlags ==
nullptr ? NULL : srcElementFlags->InternalPointer;
- ID3D11UnorderedAccessView* nativeDest = dest == nullptr ? NULL :
dest->InternalPointer;
-
- HRESULT hr = InternalPointer->SegScan(
static_cast<D3DX11_SCAN_DATA_TYPE>( elementType ),
static_cast<D3DX11_SCAN_OPCODE>( operation ), numberOfElements, nativeSrc,
nativeSrcElementFlags, nativeDest );
- return RECORD_D3D11( hr );
- }
-}
-}
=======================================
--- /branches/lite/source/direct3d11/SegmentedScan11.h Sat Jan 28 10:03:11
2012
+++ /dev/null
@@ -1,75 +0,0 @@
-/*
-* Copyright (c) 2007-2012 SlimDX Group
-*
-* Permission is hereby granted, free of charge, to any person obtaining a
copy
-* of this software and associated documentation files (the "Software"), to
deal
-* in the Software without restriction, including without limitation the
rights
-* to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
-* copies of the Software, and to permit persons to whom the Software is
-* furnished to do so, subject to the following conditions:
-*
-* The above copyright notice and this permission notice shall be included
in
-* all copies or substantial portions of the Software.
-*
-* THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS
OR
-* IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-* FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL
THE
-* AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
-* LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING
FROM,
-* OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
-* THE SOFTWARE.
-*/
-#pragma once
-
-#include "../ComObject.h"
-
-#include "../dxgi/Enums.h"
-
-#include "../ComObject.h"
-
-#include "Enums11.h"
-
-namespace SlimDX
-{
- namespace Direct3D11
- {
- ref class DeviceContext;
- ref class UnorderedAccessView;
-
- /// <summary>
- /// Represents a segmented scan context.
- /// </summary>
- /// <unmanaged>ID3DX11SegmentedScan</unmanaged>
- public ref class SegmentedScan : public ComObject
- {
- COMOBJECT(ID3DX11SegmentedScan, SegmentedScan);
-
- public:
- /// <summary>
- /// Initializes a new instance of the <see cref="SegmentedScan"/> class.
- /// </summary>
- /// <param name="deviceContext">The device context with which to
associate the scan object.</param>
- /// <param name="maxElementScanSize">Maximum single scan size, in
elements.</param>
- SegmentedScan( DeviceContext^ deviceContext, int maxElementScanSize );
-
- /// <summary>
- /// Sets the scan direction.
- /// </summary>
- /// <param name="direction">The direction in which to perform the
scans.</param>
- /// <returns>A <see cref="SlimDX::Result"/> object describing the
result of the operation.</returns>
- Result SetScanDirection( ScanDirection direction );
-
- /// <summary>
- /// Performs a segmented scan of a sequence.
- /// </summary>
- /// <param name="elementType">The type of element in the
sequence.</param>
- /// <param name="operation">The binary operation to perform.</param>
- /// <param name="elementCount">Size of scan in elements.</param>
- /// <param name="source">Input sequence on the device. Set <paramref
name="source"/> and <paramref name="destination"/> to the same value for
in-place scans.</param>
- /// <param name="elementFlags">Compact array of bits with one bit per
element of <paramref name="source"/>. A set value indicates the start of a
new segment.</param>
- /// <param name="destination">Output sequence on the device.</param>
- /// <returns>A <see cref="SlimDX::Result"/> object describing the
result of the operation.</returns>
- Result PerformSegmentedScan( ScanDataType elementType, ScanOpCode
operation, int elementCount, UnorderedAccessView^ source,
UnorderedAccessView^ elementFlags, UnorderedAccessView^ destination );
- };
- }
-};
=======================================
--- /branches/lite/source/direct3d11/TextureLoadInformation11.cpp Sat Jan
28 10:03:11 2012
+++ /dev/null
@@ -1,31 +0,0 @@
-/*
-* Copyright (c) 2007-2012 SlimDX Group
-*
-* Permission is hereby granted, free of charge, to any person obtaining a
copy
-* of this software and associated documentation files (the "Software"), to
deal
-* in the Software without restriction, including without limitation the
rights
-* to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
-* copies of the Software, and to permit persons to whom the Software is
-* furnished to do so, subject to the following conditions:
-*
-* The above copyright notice and this permission notice shall be included
in
-* all copies or substantial portions of the Software.
-*
-* THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS
OR
-* IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-* FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL
THE
-* AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
-* LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING
FROM,
-* OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
-* THE SOFTWARE.
-*/
-#include "stdafx.h"
-
-#include "TextureLoadInformation11.h"
-
-namespace SlimDX
-{
-namespace Direct3D11
-{
-}
-}
=======================================
--- /branches/lite/source/direct3d11/TextureLoadInformation11.h Sat Jan 28
10:03:11 2012
+++ /dev/null
@@ -1,89 +0,0 @@
-/*
-* Copyright (c) 2007-2012 SlimDX Group
-*
-* Permission is hereby granted, free of charge, to any person obtaining a
copy
-* of this software and associated documentation files (the "Software"), to
deal
-* in the Software without restriction, including without limitation the
rights
-* to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
-* copies of the Software, and to permit persons to whom the Software is
-* furnished to do so, subject to the following conditions:
-*
-* The above copyright notice and this permission notice shall be included
in
-* all copies or substantial portions of the Software.
-*
-* THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS
OR
-* IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-* FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL
THE
-* AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
-* LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING
FROM,
-* OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
-* THE SOFTWARE.
-*/
-#pragma once
-
-#include "Enums11.h"
-#include "ResourceRegion11.h"
-
-namespace SlimDX
-{
- namespace Direct3D11
- {
- /// <summary>
- /// Describes parameters used to load a texture from another texture.
- /// </summary>
- /// <unmanaged>D3DX11_TEXTURE_LOAD_INFO</unmanaged>
- public value class TextureLoadInformation
- {
- public:
- /// <summary>
- /// Source texture region.
- /// </summary>
- property ResourceRegion SourceRegion;
-
- /// <summary>
- /// Destination texture region.
- /// </summary>
- property ResourceRegion DestinationRegion;
-
- /// <summary>
- /// Source texture mipmap level.
- /// </summary>
- property int FirstSourceMip;
-
- /// <summary>
- /// Destination texture mipmap level.
- /// </summary>
- property int FirstDestinationMip;
-
- /// <summary>
- /// Number of mipmap levels in the source texture.
- /// </summary>
- property int MipCount;
-
- /// <summary>
- /// First element of the source texture.
- /// </summary>
- property int FirstSourceElement;
-
- /// <summary>
- /// First element of the destination texture.
- /// </summary>
- property int FirstDestinationElement;
-
- /// <summary>
- /// Number of elements to load.
- /// </summary>
- property int ElementCount;
-
- /// <summary>
- /// Filtering options during resampling.
- /// </summary>
- property FilterFlags Filter;
-
- /// <summary>
- /// Filtering options when generating mip levels.
- /// </summary>
- property FilterFlags MipFilter;
- };
- }
-}
=======================================
--- /branches/lite/build/SlimDX.sln Sat Mar 17 11:15:48 2012
+++ /branches/lite/build/SlimDX.sln Sat Mar 17 12:07:17 2012
@@ -9,45 +9,26 @@
GlobalSection(SolutionConfigurationPlatforms) = preSolution
Debug|x64 = Debug|x64
Debug|x86 = Debug|x86
- Debug-4.0|x64 = Debug-4.0|x64
- Debug-4.0|x86 = Debug-4.0|x86
- Public-4.0|x64 = Public-4.0|x64
- Public-4.0|x86 = Public-4.0|x86
Release|x64 = Release|x64
Release|x86 = Release|x86
- Release-4.0|x64 = Release-4.0|x64
- Release-4.0|x86 = Release-4.0|x86
EndGlobalSection
GlobalSection(ProjectConfigurationPlatforms) = postSolution
- {8ECCE443-0440-40F4-A94C-F02E027282C3}.Debug|x64.ActiveCfg = Debug-4.0|
x64
- {8ECCE443-0440-40F4-A94C-F02E027282C3}.Debug|x64.Build.0 = Debug-4.0|x64
- {8ECCE443-0440-40F4-A94C-F02E027282C3}.Debug|x86.ActiveCfg = Debug-4.0|
x64
- {8ECCE443-0440-40F4-A94C-F02E027282C3}.Debug-4.0|x64.ActiveCfg =
Debug-4.0|x64
- {8ECCE443-0440-40F4-A94C-F02E027282C3}.Debug-4.0|x64.Build.0 = Debug-4.0|
x64
- {8ECCE443-0440-40F4-A94C-F02E027282C3}.Debug-4.0|x86.ActiveCfg =
Debug-4.0|Win32
- {8ECCE443-0440-40F4-A94C-F02E027282C3}.Debug-4.0|x86.Build.0 = Debug-4.0|
Win32
- {8ECCE443-0440-40F4-A94C-F02E027282C3}.Public-4.0|x64.ActiveCfg =
Release-4.0|x64
- {8ECCE443-0440-40F4-A94C-F02E027282C3}.Public-4.0|x64.Build.0 =
Release-4.0|x64
- {8ECCE443-0440-40F4-A94C-F02E027282C3}.Public-4.0|x86.ActiveCfg =
Release-4.0|x64
- {8ECCE443-0440-40F4-A94C-F02E027282C3}.Release|x64.ActiveCfg =
Release-4.0|x64
- {8ECCE443-0440-40F4-A94C-F02E027282C3}.Release|x64.Build.0 = Release-4.0|
x64
- {8ECCE443-0440-40F4-A94C-F02E027282C3}.Release|x86.ActiveCfg =
Release-4.0|x64
- {8ECCE443-0440-40F4-A94C-F02E027282C3}.Release-4.0|x64.ActiveCfg =
Release-4.0|x64
- {8ECCE443-0440-40F4-A94C-F02E027282C3}.Release-4.0|x64.Build.0 =
Release-4.0|x64
- {8ECCE443-0440-40F4-A94C-F02E027282C3}.Release-4.0|x86.ActiveCfg =
Release-4.0|Win32
- {8ECCE443-0440-40F4-A94C-F02E027282C3}.Release-4.0|x86.Build.0 =
Release-4.0|Win32
+ {8ECCE443-0440-40F4-A94C-F02E027282C3}.Debug|x64.ActiveCfg = Debug|x64
+ {8ECCE443-0440-40F4-A94C-F02E027282C3}.Debug|x64.Build.0 = Debug|x64
+ {8ECCE443-0440-40F4-A94C-F02E027282C3}.Debug|x86.ActiveCfg = Debug|Win32
+ {8ECCE443-0440-40F4-A94C-F02E027282C3}.Debug|x86.Build.0 = Debug|Win32
+ {8ECCE443-0440-40F4-A94C-F02E027282C3}.Release|x64.ActiveCfg = Release|
x64
+ {8ECCE443-0440-40F4-A94C-F02E027282C3}.Release|x64.Build.0 = Release|x64
+ {8ECCE443-0440-40F4-A94C-F02E027282C3}.Release|x86.ActiveCfg = Release|
Win32
+ {8ECCE443-0440-40F4-A94C-F02E027282C3}.Release|x86.Build.0 = Release|
Win32
{820FE441-822F-4519-994B-04F1DE27FF15}.Debug|x64.ActiveCfg = Debug|Any
CPU
{820FE441-822F-4519-994B-04F1DE27FF15}.Debug|x64.Build.0 = Debug|Any CPU
{820FE441-822F-4519-994B-04F1DE27FF15}.Debug|x86.ActiveCfg = Debug|Any
CPU
- {820FE441-822F-4519-994B-04F1DE27FF15}.Debug-4.0|x64.ActiveCfg = Debug|
Any CPU
- {820FE441-822F-4519-994B-04F1DE27FF15}.Debug-4.0|x86.ActiveCfg = Debug|
Any CPU
- {820FE441-822F-4519-994B-04F1DE27FF15}.Public-4.0|x64.ActiveCfg =
Release|Any CPU
- {820FE441-822F-4519-994B-04F1DE27FF15}.Public-4.0|x86.ActiveCfg =
Release|Any CPU
+ {820FE441-822F-4519-994B-04F1DE27FF15}.Debug|x86.Build.0 = Debug|Any CPU
{820FE441-822F-4519-994B-04F1DE27FF15}.Release|x64.ActiveCfg = Release|
Any CPU
+ {820FE441-822F-4519-994B-04F1DE27FF15}.Release|x64.Build.0 = Release|Any
CPU
{820FE441-822F-4519-994B-04F1DE27FF15}.Release|x86.ActiveCfg = Release|
Any CPU
- {820FE441-822F-4519-994B-04F1DE27FF15}.Release-4.0|x64.ActiveCfg =
Release|Any CPU
- {820FE441-822F-4519-994B-04F1DE27FF15}.Release-4.0|x64.Build.0 = Release|
Any CPU
- {820FE441-822F-4519-994B-04F1DE27FF15}.Release-4.0|x86.ActiveCfg =
Release|Any CPU
+ {820FE441-822F-4519-994B-04F1DE27FF15}.Release|x86.Build.0 = Release|Any
CPU
EndGlobalSection
GlobalSection(SolutionProperties) = preSolution
HideSolutionNode = FALSE
=======================================
--- /branches/lite/build/SlimDX.vcxproj Sat Mar 17 11:15:48 2012
+++ /branches/lite/build/SlimDX.vcxproj Sat Mar 17 12:07:17 2012
@@ -1,20 +1,20 @@
<?xml version="1.0" encoding="utf-8"?>
<Project DefaultTargets="Build" ToolsVersion="4.0"
xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
<ItemGroup Label="ProjectConfigurations">
- <ProjectConfiguration Include="Debug-4.0|Win32">
- <Configuration>Debug-4.0</Configuration>
+ <ProjectConfiguration Include="Debug|Win32">
+ <Configuration>Debug</Configuration>
<Platform>Win32</Platform>
</ProjectConfiguration>
- <ProjectConfiguration Include="Debug-4.0|x64">
- <Configuration>Debug-4.0</Configuration>
+ <ProjectConfiguration Include="Debug|x64">
+ <Configuration>Debug</Configuration>
<Platform>x64</Platform>
</ProjectConfiguration>
- <ProjectConfiguration Include="Release-4.0|Win32">
- <Configuration>Release-4.0</Configuration>
+ <ProjectConfiguration Include="Release|Win32">
+ <Configuration>Release</Configuration>
<Platform>Win32</Platform>
</ProjectConfiguration>
- <ProjectConfiguration Include="Release-4.0|x64">
- <Configuration>Release-4.0</Configuration>
+ <ProjectConfiguration Include="Release|x64">
+ <Configuration>Release</Configuration>
<Platform>x64</Platform>
</ProjectConfiguration>
</ItemGroup>
@@ -24,24 +24,24 @@
<Keyword>ManagedCProj</Keyword>
</PropertyGroup>
<Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
- <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release-4.0|
Win32'" Label="Configuration">
+ <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|
Win32'" Label="Configuration">
<ConfigurationType>DynamicLibrary</ConfigurationType>
<CharacterSet>Unicode</CharacterSet>
<CLRSupport>true</CLRSupport>
<WholeProgramOptimization>true</WholeProgramOptimization>
</PropertyGroup>
- <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug-4.0|
Win32'" Label="Configuration">
+ <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'"
Label="Configuration">
<ConfigurationType>DynamicLibrary</ConfigurationType>
<CharacterSet>Unicode</CharacterSet>
<CLRSupport>true</CLRSupport>
</PropertyGroup>
- <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release-4.0|
x64'" Label="Configuration">
+ <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'"
Label="Configuration">
<ConfigurationType>DynamicLibrary</ConfigurationType>
<CharacterSet>Unicode</CharacterSet>
<CLRSupport>true</CLRSupport>
<WholeProgramOptimization>true</WholeProgramOptimization>
</PropertyGroup>
- <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug-4.0|
x64'" Label="Configuration">
+ <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'"
Label="Configuration">
<ConfigurationType>DynamicLibrary</ConfigurationType>
<CharacterSet>Unicode</CharacterSet>
<CLRSupport>true</CLRSupport>
@@ -49,35 +49,35 @@
<Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />
<ImportGroup Label="ExtensionSettings">
</ImportGroup>
- <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Release-4.0|
Win32'" Label="PropertySheets">
+ <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'"
Label="PropertySheets">
<Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props"
Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')"
Label="LocalAppDataPlatform" />
</ImportGroup>
- <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Debug-4.0|
Win32'" Label="PropertySheets">
+ <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'"
Label="PropertySheets">
<Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props"
Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')"
Label="LocalAppDataPlatform" />
</ImportGroup>
- <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Release-4.0|
x64'" Label="PropertySheets">
+ <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'"
Label="PropertySheets">
<Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props"
Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')"
Label="LocalAppDataPlatform" />
</ImportGroup>
- <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Debug-4.0|x64'"
Label="PropertySheets">
+ <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'"
Label="PropertySheets">
<Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props"
Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')"
Label="LocalAppDataPlatform" />
</ImportGroup>
<PropertyGroup Label="UserMacros" />
<PropertyGroup>
<_ProjectFileVersion>10.0.30319.1</_ProjectFileVersion>
- <OutDir Condition="'$(Configuration)|$(Platform)'=='Debug-4.0|
Win32'">$(SolutionDir)x86\$(Configuration)\</OutDir>
- <IntDir Condition="'$(Configuration)|$(Platform)'=='Debug-4.0|
Win32'">$(SolutionDir)x86\$(Configuration)\</IntDir>
- <LinkIncremental Condition="'$(Configuration)|$(Platform)'=='Debug-4.0|
Win32'">false</LinkIncremental>
- <OutDir Condition="'$(Configuration)|$(Platform)'=='Debug-4.0|
x64'">$(SolutionDir)$(Platform)\$(Configuration)\</OutDir>
- <IntDir Condition="'$(Configuration)|$(Platform)'=='Debug-4.0|
x64'">$(SolutionDir)$(Platform)\$(Configuration)\</IntDir>
- <LinkIncremental Condition="'$(Configuration)|$(Platform)'=='Debug-4.0|
x64'">false</LinkIncremental>
- <OutDir Condition="'$(Configuration)|$(Platform)'=='Release-4.0|
Win32'">$(SolutionDir)x86\$(Configuration)\</OutDir>
- <IntDir Condition="'$(Configuration)|$(Platform)'=='Release-4.0|
Win32'">$(SolutionDir)x86\$(Configuration)\</IntDir>
- <LinkIncremental Condition="'$(Configuration)|
$(Platform)'=='Release-4.0|Win32'">false</LinkIncremental>
- <OutDir Condition="'$(Configuration)|$(Platform)'=='Release-4.0|
x64'">$(SolutionDir)$(Platform)\$(Configuration)\</OutDir>
- <IntDir Condition="'$(Configuration)|$(Platform)'=='Release-4.0|
x64'">$(SolutionDir)$(Platform)\$(Configuration)\</IntDir>
- <LinkIncremental Condition="'$(Configuration)|
$(Platform)'=='Release-4.0|x64'">false</LinkIncremental>
+ <OutDir Condition="'$(Configuration)|$(Platform)'=='Debug|
Win32'">$(SolutionDir)x86\$(Configuration)\</OutDir>
+ <IntDir Condition="'$(Configuration)|$(Platform)'=='Debug|
Win32'">$(SolutionDir)x86\$(Configuration)\</IntDir>
+ <LinkIncremental Condition="'$(Configuration)|$(Platform)'=='Debug|
Win32'">false</LinkIncremental>
+ <OutDir Condition="'$(Configuration)|$(Platform)'=='Debug|
x64'">$(SolutionDir)$(Platform)\$(Configuration)\</OutDir>
+ <IntDir Condition="'$(Configuration)|$(Platform)'=='Debug|
x64'">$(SolutionDir)$(Platform)\$(Configuration)\</IntDir>
+ <LinkIncremental Condition="'$(Configuration)|$(Platform)'=='Debug|
x64'">false</LinkIncremental>
+ <OutDir Condition="'$(Configuration)|$(Platform)'=='Release|
Win32'">$(SolutionDir)x86\$(Configuration)\</OutDir>
+ <IntDir Condition="'$(Configuration)|$(Platform)'=='Release|
Win32'">$(SolutionDir)x86\$(Configuration)\</IntDir>
+ <LinkIncremental Condition="'$(Configuration)|$(Platform)'=='Release|
Win32'">false</LinkIncremental>
+ <OutDir Condition="'$(Configuration)|$(Platform)'=='Release|
x64'">$(SolutionDir)$(Platform)\$(Configuration)\</OutDir>
+ <IntDir Condition="'$(Configuration)|$(Platform)'=='Release|
x64'">$(SolutionDir)$(Platform)\$(Configuration)\</IntDir>
+ <LinkIncremental Condition="'$(Configuration)|$(Platform)'=='Release|
x64'">false</LinkIncremental>
</PropertyGroup>
- <ItemDefinitionGroup Condition="'$(Configuration)|
$(Platform)'=='Debug-4.0|Win32'">
+ <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|
Win32'">
<ClCompile>
<Optimization>Disabled</Optimization>

<AdditionalIncludeDirectories>$(ProjectDir)..\external\;$(ProjectDir)..\external\Effects11\Inc;$(DXSDK_DIR)Include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
@@ -91,10 +91,10 @@
<MultiProcessorCompilation>true</MultiProcessorCompilation>
</ClCompile>
<Link>
-
<AdditionalDependencies>user32.lib;gdi32.lib;dxguid.lib;dxgi.lib;xinput.lib;dxerr.lib;ole32.lib;x3daudio.lib;winmm.lib;d3dcompiler.lib;d3d11.lib;d3dx11.lib;dwrite.lib;d3dcsx.lib;advapi32.lib</AdditionalDependencies>
+
<AdditionalDependencies>user32.lib;gdi32.lib;dxguid.lib;dxgi.lib;xinput.lib;dxerr.lib;ole32.lib;x3daudio.lib;winmm.lib;d3dcompiler.lib;d3d11.lib;dwrite.lib;advapi32.lib</AdditionalDependencies>
<Version>0.0.0.0</Version>

<AdditionalLibraryDirectories>$(DXSDK_DIR)Lib\x86;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
-
<DelayLoadDLLs>d3dx11_43.dll;d3dcompiler_43.dll;d3dcsx_43.dll;d3d11.dll;dwrite.dll;dxgi.dll;x3daudio1_7.dll;xinput1_3.dll;%(DelayLoadDLLs)</DelayLoadDLLs>
+
<DelayLoadDLLs>d3dcompiler_43.dll;d3d11.dll;dwrite.dll;dxgi.dll;x3daudio1_7.dll;xinput1_3.dll;%(DelayLoadDLLs)</DelayLoadDLLs>
<GenerateDebugInformation>true</GenerateDebugInformation>
<AssemblyDebug>true</AssemblyDebug>
<LinkTimeCodeGeneration>
@@ -110,7 +110,7 @@
<CLRUnmanagedCodeCheck>true</CLRUnmanagedCodeCheck>
</Link>
</ItemDefinitionGroup>
- <ItemDefinitionGroup Condition="'$(Configuration)|
$(Platform)'=='Debug-4.0|x64'">
+ <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|
x64'">
<Midl>
<TargetEnvironment>X64</TargetEnvironment>
</Midl>
@@ -127,10 +127,10 @@
<MultiProcessorCompilation>true</MultiProcessorCompilation>
</ClCompile>
<Link>
-
<AdditionalDependencies>user32.lib;gdi32.lib;dxguid.lib;dxgi.lib;xinput.lib;dxerr.lib;ole32.lib;x3daudio.lib;winmm.lib;d3dcompiler.lib;d3d11.lib;d3dx11.lib;dwrite.lib;d3dcsx.lib;advapi32.lib</AdditionalDependencies>
+
<AdditionalDependencies>user32.lib;gdi32.lib;dxguid.lib;dxgi.lib;xinput.lib;dxerr.lib;ole32.lib;x3daudio.lib;winmm.lib;d3dcompiler.lib;d3d11.lib;dwrite.lib;advapi32.lib</AdditionalDependencies>
<Version>0.0.0.0</Version>

<AdditionalLibraryDirectories>$(DXSDK_DIR)Lib\x64;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
-
<DelayLoadDLLs>d3dx11_43.dll;d3dcompiler_43.dll;d3dcsx_43.dll;d3d11.dll;dwrite.dll;dxgi.dll;x3daudio1_7.dll;xinput1_3.dll;%(DelayLoadDLLs)</DelayLoadDLLs>
+
<DelayLoadDLLs>d3dcompiler_43.dll;d3d11.dll;dwrite.dll;dxgi.dll;x3daudio1_7.dll;xinput1_3.dll;%(DelayLoadDLLs)</DelayLoadDLLs>
<GenerateDebugInformation>true</GenerateDebugInformation>
<AssemblyDebug>true</AssemblyDebug>
<LinkTimeCodeGeneration>
@@ -146,7 +146,7 @@
<CLRUnmanagedCodeCheck>true</CLRUnmanagedCodeCheck>
</Link>
</ItemDefinitionGroup>
- <ItemDefinitionGroup Condition="'$(Configuration)|
$(Platform)'=='Release-4.0|Win32'">
+ <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|
Win32'">
<ClCompile>
<Optimization>MaxSpeed</Optimization>
<InlineFunctionExpansion>AnySuitable</InlineFunctionExpansion>
@@ -164,10 +164,10 @@
<MultiProcessorCompilation>true</MultiProcessorCompilation>
</ClCompile>
<Link>
-
<AdditionalDependencies>user32.lib;gdi32.lib;dxguid.lib;dxgi.lib;xinput.lib;dxerr.lib;ole32.lib;x3daudio.lib;winmm.lib;d3dcompiler.lib;d3d11.lib;d3dx11.lib;dwrite.lib;d3dcsx.lib;advapi32.lib</AdditionalDependencies>
+
<AdditionalDependencies>user32.lib;gdi32.lib;dxguid.lib;dxgi.lib;xinput.lib;dxerr.lib;ole32.lib;x3daudio.lib;winmm.lib;d3dcompiler.lib;d3d11.lib;dwrite.lib;advapi32.lib</AdditionalDependencies>
<Version>0.0.0.0</Version>

<AdditionalLibraryDirectories>$(DXSDK_DIR)Lib\x86;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
-
<DelayLoadDLLs>d3dx11_43.dll;d3dcompiler_43.dll;d3dcsx_43.dll;d3d11.dll;dwrite.dll;dxgi.dll;x3daudio1_7.dll;xinput1_3.dll;%(DelayLoadDLLs)</DelayLoadDLLs>
+
<DelayLoadDLLs>d3dcompiler_43.dll;d3d11.dll;dwrite.dll;dxgi.dll;x3daudio1_7.dll;xinput1_3.dll;%(DelayLoadDLLs)</DelayLoadDLLs>
<GenerateDebugInformation>true</GenerateDebugInformation>
<RandomizedBaseAddress>false</RandomizedBaseAddress>
<DataExecutionPrevention>
@@ -178,7 +178,7 @@
<CLRUnmanagedCodeCheck>true</CLRUnmanagedCodeCheck>
</Link>
</ItemDefinitionGroup>
- <ItemDefinitionGroup Condition="'$(Configuration)|
$(Platform)'=='Release-4.0|x64'">
+ <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|
x64'">
<Midl>
<TargetEnvironment>X64</TargetEnvironment>
</Midl>
@@ -198,10 +198,10 @@
<MultiProcessorCompilation>true</MultiProcessorCompilation>
</ClCompile>
<Link>
-
<AdditionalDependencies>user32.lib;gdi32.lib;dxguid.lib;dxgi.lib;xinput.lib;dxerr.lib;ole32.lib;x3daudio.lib;winmm.lib;d3dcompiler.lib;d3d11.lib;d3dx11.lib;dwrite.lib;d3dcsx.lib;advapi32.lib</AdditionalDependencies>
+
<AdditionalDependencies>user32.lib;gdi32.lib;dxguid.lib;dxgi.lib;xinput.lib;dxerr.lib;ole32.lib;x3daudio.lib;winmm.lib;d3dcompiler.lib;d3d11.lib;dwrite.lib;advapi32.lib</AdditionalDependencies>
<Version>0.0.0.0</Version>

<AdditionalLibraryDirectories>$(DXSDK_DIR)Lib\x64;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
-
<DelayLoadDLLs>d3dx11_43.dll;d3dcompiler_43.dll;d3dcsx_43.dll;d3d11.dll;dwrite.dll;dxgi.dll;x3daudio1_7.dll;xinput1_3.dll;%(DelayLoadDLLs)</DelayLoadDLLs>
+
<DelayLoadDLLs>d3dcompiler_43.dll;d3d11.dll;dwrite.dll;dxgi.dll;x3daudio1_7.dll;xinput1_3.dll;%(DelayLoadDLLs)</DelayLoadDLLs>
<GenerateDebugInformation>true</GenerateDebugInformation>
<RandomizedBaseAddress>false</RandomizedBaseAddress>
<DataExecutionPrevention>
@@ -384,7 +384,6 @@
<ClCompile
Include="..\source\direct3d11\InfoQueueFilterDescription11.cpp" />
<ClCompile Include="..\source\direct3d11\Resource11.cpp" />
<ClCompile Include="..\source\direct3d11\ResourceRegion11.cpp" />
- <ClCompile Include="..\source\direct3d11\TextureLoadInformation11.cpp"
/>
<ClCompile Include="..\source\direct3d11\ResourceView11.cpp" />
<ClCompile Include="..\source\direct3d11\DepthStencilView11.cpp" />
<ClCompile
Include="..\source\direct3d11\DepthStencilViewDescription11.cpp" />
@@ -423,8 +422,6 @@
<ClCompile Include="..\source\direct3d11\InputLayout11.cpp" />
<ClCompile
Include="..\source\direct3d11\StreamOutputBufferBinding11.cpp" />
<ClCompile Include="..\source\direct3d11\StreamOutputElement11.cpp" />
- <ClCompile Include="..\source\direct3d11\ImageInformation11.cpp" />
- <ClCompile Include="..\source\direct3d11\ImageLoadInformation11.cpp" />
<ClCompile Include="..\source\direct3d11\Texture1D11.cpp" />
<ClCompile Include="..\source\direct3d11\Texture1DDescription11.cpp" />
<ClCompile Include="..\source\direct3d11\Texture2D11.cpp" />
@@ -433,11 +430,6 @@
<ClCompile Include="..\source\direct3d11\Texture3DDescription11.cpp" />
<ClCompile Include="..\source\direct3d11\Asynchronous11.cpp" />
<ClCompile Include="..\source\direct3d11\Viewport11.cpp" />
- <ClCompile Include="..\source\direct3d11\FastFourierTransform11.cpp" />
- <ClCompile
Include="..\source\direct3d11\FastFourierTransformBufferRequirements11.cpp"
/>
- <ClCompile
Include="..\source\direct3d11\FastFourierTransformDescription11.cpp" />
- <ClCompile Include="..\source\direct3d11\Scan11.cpp" />
- <ClCompile Include="..\source\direct3d11\SegmentedScan11.cpp" />
<ClCompile Include="..\source\d3dcompiler\D3DCompilerException.cpp" />
<ClCompile Include="..\source\d3dcompiler\IncludeDC.cpp" />
<ClCompile Include="..\source\d3dcompiler\ShaderMacroDC.cpp" />
@@ -454,14 +446,14 @@
<ClCompile
Include="..\source\d3dcompiler\ShaderReflectionVariableDC.cpp" />
<ClCompile
Include="..\source\d3dcompiler\ShaderVariableDescriptionDC.cpp" />
<ClCompile Include="..\source\AssemblyInfo.cpp">
- <PrecompiledHeader Condition="'$(Configuration)|
$(Platform)'=='Debug-4.0|Win32'">Create</PrecompiledHeader>
- <PrecompiledHeaderFile Condition="'$(Configuration)|
$(Platform)'=='Debug-4.0|Win32'">stdafx.h</PrecompiledHeaderFile>
- <PrecompiledHeader Condition="'$(Configuration)|
$(Platform)'=='Debug-4.0|x64'">Create</PrecompiledHeader>
- <PrecompiledHeaderFile Condition="'$(Configuration)|
$(Platform)'=='Debug-4.0|x64'">stdafx.h</PrecompiledHeaderFile>
- <PrecompiledHeader Condition="'$(Configuration)|
$(Platform)'=='Release-4.0|Win32'">Create</PrecompiledHeader>
- <PrecompiledHeaderFile Condition="'$(Configuration)|
$(Platform)'=='Release-4.0|Win32'">stdafx.h</PrecompiledHeaderFile>
- <PrecompiledHeader Condition="'$(Configuration)|
$(Platform)'=='Release-4.0|x64'">Create</PrecompiledHeader>
- <PrecompiledHeaderFile Condition="'$(Configuration)|
$(Platform)'=='Release-4.0|x64'">stdafx.h</PrecompiledHeaderFile>
+ <PrecompiledHeader Condition="'$(Configuration)|$(Platform)'=='Debug|
Win32'">Create</PrecompiledHeader>
+ <PrecompiledHeaderFile Condition="'$(Configuration)|
$(Platform)'=='Debug|Win32'">stdafx.h</PrecompiledHeaderFile>
+ <PrecompiledHeader Condition="'$(Configuration)|$(Platform)'=='Debug|
x64'">Create</PrecompiledHeader>
+ <PrecompiledHeaderFile Condition="'$(Configuration)|
$(Platform)'=='Debug|x64'">stdafx.h</PrecompiledHeaderFile>
+ <PrecompiledHeader Condition="'$(Configuration)|
$(Platform)'=='Release|Win32'">Create</PrecompiledHeader>
+ <PrecompiledHeaderFile Condition="'$(Configuration)|
$(Platform)'=='Release|Win32'">stdafx.h</PrecompiledHeaderFile>
+ <PrecompiledHeader Condition="'$(Configuration)|
$(Platform)'=='Release|x64'">Create</PrecompiledHeader>
+ <PrecompiledHeaderFile Condition="'$(Configuration)|
$(Platform)'=='Release|x64'">stdafx.h</PrecompiledHeaderFile>
</ClCompile>
</ItemGroup>
<ItemGroup>
@@ -648,7 +640,6 @@
<ClInclude
Include="..\source\direct3d11\InfoQueueFilterDescription11.h" />
<ClInclude Include="..\source\direct3d11\Resource11.h" />
<ClInclude Include="..\source\direct3d11\ResourceRegion11.h" />
- <ClInclude Include="..\source\direct3d11\TextureLoadInformation11.h" />
<ClInclude Include="..\source\direct3d11\ResourceView11.h" />
<ClInclude Include="..\source\direct3d11\DepthStencilView11.h" />
<ClInclude
Include="..\source\direct3d11\DepthStencilViewDescription11.h" />
@@ -687,8 +678,6 @@
<ClInclude Include="..\source\direct3d11\InputLayout11.h" />
<ClInclude
Include="..\source\direct3d11\StreamOutputBufferBinding11.h" />
<ClInclude Include="..\source\direct3d11\StreamOutputElement11.h" />
- <ClInclude Include="..\source\direct3d11\ImageInformation11.h" />
- <ClInclude Include="..\source\direct3d11\ImageLoadInformation11.h" />
<ClInclude Include="..\source\direct3d11\Texture1D11.h" />
<ClInclude Include="..\source\direct3d11\Texture1DDescription11.h" />
<ClInclude Include="..\source\direct3d11\Texture2D11.h" />
@@ -697,11 +686,6 @@
<ClInclude Include="..\source\direct3d11\Texture3DDescription11.h" />
<ClInclude Include="..\source\direct3d11\Asynchronous11.h" />
<ClInclude Include="..\source\direct3d11\Viewport11.h" />
- <ClInclude Include="..\source\direct3d11\FastFourierTransform11.h" />
- <ClInclude
Include="..\source\direct3d11\FastFourierTransformBufferRequirements11.h" />
- <ClInclude
Include="..\source\direct3d11\FastFourierTransformDescription11.h" />
- <ClInclude Include="..\source\direct3d11\Scan11.h" />
- <ClInclude Include="..\source\direct3d11\SegmentedScan11.h" />
<ClInclude Include="..\source\d3dcompiler\D3DCompilerException.h" />
<ClInclude Include="..\source\d3dcompiler\EnumsDC.h" />
<ClInclude Include="..\source\d3dcompiler\IncludeDC.h" />
=======================================
--- /branches/lite/build/SlimDX.vcxproj.filters Sat Mar 17 11:15:48 2012
+++ /branches/lite/build/SlimDX.vcxproj.filters Sat Mar 17 12:07:17 2012
@@ -235,9 +235,6 @@
<Filter Include="Direct3D11\Viewport">

<UniqueIdentifier>{3e652314-afd6-4d7a-8bfc-24957d97d064}</UniqueIdentifier>
</Filter>
- <Filter Include="Direct3D11\Compute">
-
<UniqueIdentifier>{e832a3c8-436b-4b7a-8405-19e851c5ae1e}</UniqueIdentifier>
- </Filter>
<Filter Include="D3DCompiler">

<UniqueIdentifier>{ee4d36c7-3168-4010-8dfe-c1d56d9ecf7b}</UniqueIdentifier>
</Filter>
@@ -699,9 +696,6 @@
<ClCompile Include="..\source\direct3d11\ResourceRegion11.cpp">
<Filter>Direct3D11\Resource</Filter>
</ClCompile>
- <ClCompile Include="..\source\direct3d11\TextureLoadInformation11.cpp">
- <Filter>Direct3D11\Resource</Filter>
- </ClCompile>
<ClCompile Include="..\source\direct3d11\ResourceView11.cpp">
<Filter>Direct3D11\Resource Views</Filter>
</ClCompile>
@@ -816,12 +810,6 @@
<ClCompile Include="..\source\direct3d11\StreamOutputElement11.cpp">
<Filter>Direct3D11\Stream Output</Filter>
</ClCompile>
- <ClCompile Include="..\source\direct3d11\ImageInformation11.cpp">
- <Filter>Direct3D11\Texture</Filter>
- </ClCompile>
- <ClCompile Include="..\source\direct3d11\ImageLoadInformation11.cpp">
- <Filter>Direct3D11\Texture</Filter>
- </ClCompile>
<ClCompile Include="..\source\direct3d11\Texture1D11.cpp">
<Filter>Direct3D11\Texture\1D</Filter>
</ClCompile>
@@ -846,21 +834,6 @@
<ClCompile Include="..\source\direct3d11\Viewport11.cpp">
<Filter>Direct3D11\Viewport</Filter>
</ClCompile>
- <ClCompile Include="..\source\direct3d11\FastFourierTransform11.cpp">
- <Filter>Direct3D11\Compute</Filter>
- </ClCompile>
- <ClCompile
Include="..\source\direct3d11\FastFourierTransformBufferRequirements11.cpp">
- <Filter>Direct3D11\Compute</Filter>
- </ClCompile>
- <ClCompile
Include="..\source\direct3d11\FastFourierTransformDescription11.cpp">
- <Filter>Direct3D11\Compute</Filter>
- </ClCompile>
- <ClCompile Include="..\source\direct3d11\Scan11.cpp">
- <Filter>Direct3D11\Compute</Filter>
- </ClCompile>
- <ClCompile Include="..\source\direct3d11\SegmentedScan11.cpp">
- <Filter>Direct3D11\Compute</Filter>
- </ClCompile>
<ClCompile Include="..\source\d3dcompiler\D3DCompilerException.cpp">
<Filter>D3DCompiler</Filter>
</ClCompile>
@@ -1458,9 +1431,6 @@
<ClInclude Include="..\source\direct3d11\ResourceRegion11.h">
<Filter>Direct3D11\Resource</Filter>
</ClInclude>
- <ClInclude Include="..\source\direct3d11\TextureLoadInformation11.h">
- <Filter>Direct3D11\Resource</Filter>
- </ClInclude>
<ClInclude Include="..\source\direct3d11\ResourceView11.h">
<Filter>Direct3D11\Resource Views</Filter>
</ClInclude>
@@ -1575,12 +1545,6 @@
<ClInclude Include="..\source\direct3d11\StreamOutputElement11.h">
<Filter>Direct3D11\Stream Output</Filter>
</ClInclude>
- <ClInclude Include="..\source\direct3d11\ImageInformation11.h">
- <Filter>Direct3D11\Texture</Filter>
- </ClInclude>
- <ClInclude Include="..\source\direct3d11\ImageLoadInformation11.h">
- <Filter>Direct3D11\Texture</Filter>
- </ClInclude>
<ClInclude Include="..\source\direct3d11\Texture1D11.h">
<Filter>Direct3D11\Texture\1D</Filter>
</ClInclude>
@@ -1605,21 +1569,6 @@
<ClInclude Include="..\source\direct3d11\Viewport11.h">
<Filter>Direct3D11\Viewport</Filter>
</ClInclude>
- <ClInclude Include="..\source\direct3d11\FastFourierTransform11.h">
- <Filter>Direct3D11\Compute</Filter>
- </ClInclude>
- <ClInclude
Include="..\source\direct3d11\FastFourierTransformBufferRequirements11.h">
- <Filter>Direct3D11\Compute</Filter>
- </ClInclude>
- <ClInclude
Include="..\source\direct3d11\FastFourierTransformDescription11.h">
- <Filter>Direct3D11\Compute</Filter>
- </ClInclude>
- <ClInclude Include="..\source\direct3d11\Scan11.h">
- <Filter>Direct3D11\Compute</Filter>
- </ClInclude>
- <ClInclude Include="..\source\direct3d11\SegmentedScan11.h">
- <Filter>Direct3D11\Compute</Filter>
- </ClInclude>
<ClInclude Include="..\source\d3dcompiler\D3DCompilerException.h">
<Filter>D3DCompiler</Filter>
</ClInclude>
=======================================
--- /branches/lite/source/DataStream.h Sat Mar 17 11:15:48 2012
+++ /branches/lite/source/DataStream.h Sat Mar 17 12:07:17 2012
@@ -21,8 +21,6 @@
*/
#pragma once

-#include <d3dx9.h>
-
#ifdef XMLDOCS
using System::InvalidOperationException;
using System::ArgumentException;
=======================================
--- /branches/lite/source/Utilities.h Sat Mar 17 11:15:48 2012
+++ /branches/lite/source/Utilities.h Sat Mar 17 12:07:17 2012
@@ -21,10 +21,6 @@
*/
#pragma once

-#include <windows.h>
-#include <d3dx9.h>
-#include <dxgi.h>
-
#include "Result.h"

#ifdef XMLDOCS
=======================================
--- /branches/lite/source/direct3d11/Enums11.h Sat Mar 17 11:15:48 2012
+++ /branches/lite/source/direct3d11/Enums11.h Sat Mar 17 12:07:17 2012
@@ -231,39 +231,6 @@
InverseSecondarySourceAlpha = D3D11_BLEND_INV_SRC1_ALPHA
};

- /// <summary>
- /// The following flags are used to specify which channels in a texture
to operate on.
- /// </summary>
- /// <unmanaged>D3DX11_CHANNEL_FLAG</unmanaged>
- [System::Flags]
- public enum class Channel : System::Int32
- {
- /// <summary>
- /// Indicates the red channel should be used.
- /// </summary>
- Red = D3DX11_CHANNEL_RED,
-
- /// <summary>
- /// Indicates the blue channel should be used.
- /// </summary>
- Blue = D3DX11_CHANNEL_BLUE,
-
- /// <summary>
- /// Indicates the green channel should be used.
- /// </summary>
- Green = D3DX11_CHANNEL_GREEN,
-
- /// <summary>
- /// Indicates the alpha channel should be used.
- /// </summary>
- Alpha = D3DX11_CHANNEL_ALPHA,
-
- /// <summary>
- /// Indicates the luminances of the red, green, and blue channels
should be used.
- /// </summary>
- Luminance = D3DX11_CHANNEL_LUMINANCE
- };
-
/// <summary>Identifies which components of each pixel of a render
target are writable during blending.</summary>
/// <unmanaged>D3D11_COLOR_WRITE_ENABLE</unmanaged>
[System::Flags]
@@ -669,27 +636,6 @@
Warp = D3D_DRIVER_TYPE_WARP
};

- [System::Flags]
- public enum class FastFourierTransformCreationFlags : System::Int32
- {
- None = 0,
- DoNotPrecomputeBuffers = D3DX11_FFT_CREATE_FLAG_NO_PRECOMPUTE_BUFFERS
- };
-
- public enum class FastFourierTransformDataType : System::Int32
- {
- Real = D3DX11_FFT_DATA_TYPE_REAL,
- Complex = D3DX11_FFT_DATA_TYPE_COMPLEX
- };
-
- [System::Flags]
- public enum class FastFourierTransformDimensions : System::Int32
- {
- Dimension1D = D3DX11_FFT_DIM_MASK_1D,
- Dimension2D = D3DX11_FFT_DIM_MASK_2D,
- Dimension3D = D3DX11_FFT_DIM_MASK_3D
- };
-
/// <summary>Identifies device features that can be queried for
support.</summary>
/// <unmanaged>D3D11_FEATURE</unmanaged>
public enum class Feature : System::Int32
@@ -851,84 +797,6 @@
ComparisonAnisotropic = D3D11_FILTER_COMPARISON_ANISOTROPIC
};

- /// <summary>Specifies possible texture filtering flags.</summary>
- /// <unmanaged>D3DX11_FILTER_FLAG</unmanaged>
- [System::Flags]
- public enum class FilterFlags : System::Int32
- {
- /// <summary>
- /// No scaling or filtering will take place. Pixels outside the bounds
of the source image are assumed to be transparent black.
- /// </summary>
- None = D3DX11_FILTER_NONE,
-
- /// <summary>
- /// Each destination pixel is computed by sampling the nearest pixel
from the source image.
- /// </summary>
- Point = D3DX11_FILTER_POINT,
-
- /// <summary>
- /// Each destination pixel is computed by sampling the four nearest
pixels from the source image. This filter
- /// works best when the scale on both axes is less than two.
- /// </summary>
- Linear = D3DX11_FILTER_LINEAR,
-
- /// <summary>
- /// Every pixel in the source image contributes equally to the
destination image. This is the slowest of the filters.
- /// </summary>
- Triangle = D3DX11_FILTER_TRIANGLE,
-
- /// <summary>
- /// Each pixel is computed by averaging a 2x2(x2) box of pixels from
the source image. This filter works only when the
- /// dimensions of the destination are half those of the source, as is
the case with mipmaps.
- /// </summary>
- Box = D3DX11_FILTER_BOX,
-
- /// <summary>
- /// Pixels off the edge of the texture on the u-axis should be
mirrored, not wrapped.
- /// </summary>
- MirrorU = D3DX11_FILTER_MIRROR_U,
-
- /// <summary>
- /// Pixels off the edge of the texture on the v-axis should be
mirrored, not wrapped.
- /// </summary>
- MirrorV = D3DX11_FILTER_MIRROR_V,
-
- /// <summary>
- /// Pixels off the edge of the texture on the w-axis should be
mirrored, not wrapped.
- /// </summary>
- MirrowW = D3DX11_FILTER_MIRROR_W,
-
- /// <summary>
- /// Combines the MirrorU, MirrorV, and MirrorW flags.
- /// </summary>
- Mirror = D3DX11_FILTER_MIRROR,
-
- /// <summary>
- /// The resulting image must be dithered using a 4x4 ordered dither
algorithm. This happens when converting from one format to another.
- /// </summary>
- Dither = D3DX11_FILTER_DITHER,
-
- /// <summary>
- /// Do diffuse dithering on the image when changing from one format to
another.
- /// </summary>
- DitherDiffusion = D3DX11_FILTER_DITHER_DIFFUSION,
-
- /// <summary>
- /// Input data is in standard RGB (sRGB) color space.
- /// </summary>
- StandardRgbIn = D3DX11_FILTER_SRGB_IN,
-
- /// <summary>
- /// Output data is in standard RGB (sRGB) color space.
- /// </summary>
- StandardRgbOut = D3DX11_FILTER_SRGB_OUT,
-
- /// <summary>
- /// Combines the StandardRgbIn and StandardRgbOut flags.
- /// </summary>
- StandardRgb = D3DX11_FILTER_SRGB
- };
-
/// <summary>Identifies which resources are supported for a given format
and given device.</summary>
/// <unmanaged>D3D11_FORMAT_SUPPORT</unmanaged>
[System::Flags]
@@ -1069,51 +937,7 @@
/// </summary>
ShaderGatherComparisonIntrinsic =
D3D11_FORMAT_SUPPORT_SHADER_GATHER_COMPARISON
};
-
- /// <summary>Specifies image file formats supported by runtime.</summary>
- /// <unmanaged>D3DX11_IMAGE_FILE_FORMAT</unmanaged>
- public enum class ImageFileFormat : System::Int32
- {
- /// <summary>
- /// Windows bitmap (BMP) file format. Contains a header that describes
the resolution of the device on which the
- /// rectangle of pixels was created, the dimensions of the rectangle,
the size of the array of bits, a logical palette,
- /// and an array of bits that defines the relationship between pixels
in the bitmapped image and entries in the logical palette.
- /// </summary>
- Bmp = D3DX11_IFF_BMP,
-
- /// <summary>
- /// Joint Photographic Experts Group (JPEG) compressed file format.
Specifies variable compression of 24-bit RGB color
- /// and 8-bit gray-scale Tagged Image File Format (TIFF) image document
files.
- /// </summary>
- Jpg = D3DX11_IFF_JPG,
-
- /// <summary>
- /// Portable Network Graphics (PNG) file format. A non-proprietary
bitmap format using lossless compression.
- /// </summary>
- Png = D3DX11_IFF_PNG,
-
- /// <summary>
- /// DirectDraw surface (DDS) file format. Stores textures, volume
textures, and cubic environment maps, with or without
- /// mipmap levels, and with or without pixel compression.
- /// </summary>
- Dds = D3DX11_IFF_DDS,
-
- /// <summary>
- /// Tagged Image File Format (TIFF).
- /// </summary>
- Tiff = D3DX11_IFF_TIFF,
-
- /// <summary>
- /// Graphics Interchange Format (GIF).
- /// </summary>
- Gif = D3DX11_IFF_GIF,
-
- /// <summary>
- /// Windows Media Player format (WMP).
- /// </summary>
- Wmp = D3DX11_IFF_WMP
- };
-
+
/// <summary>Specifies possible types of data contained in an input
slot.</summary>
/// <unmanaged>D3D11_INPUT_CLASSIFICATION</unmanaged>
public enum class InputClassification : System::Int32
@@ -1261,40 +1085,6 @@
Info = D3D11_MESSAGE_SEVERITY_INFO
};

- /// <summary>
- /// Normal maps generation constants.
- /// </summary>
- /// <unmanaged>D3DX11_NORMALMAP_FLAG</unmanaged>
- [System::Flags]
- public enum class NormalMapFlags : System::Int32
- {
- /// <summary>
- /// Indicates that pixels off the edge of the texture on the u-axis
should be mirrored, not wrapped.
- /// </summary>
- MirrorU = D3DX11_NORMALMAP_MIRROR_U,
-
- /// <summary>
- /// Indicates that pixels off the edge of the texture on the v-axis
should be mirrored, not wrapped.
- /// </summary>
- MirrorV = D3DX11_NORMALMAP_MIRROR_V,
-
- /// <summary>
- /// Same as specifying the MirrorU and MirrorV flags.
- /// </summary>
- Mirror = D3DX11_NORMALMAP_MIRROR,
-
- /// <summary>
- /// Inverts the direction of each normal.
- /// </summary>
- InvertSign = D3DX11_NORMALMAP_INVERTSIGN,
-
- /// <summary>
- /// Computes the per-pixel occlusion term and encodes it into the
alpha. An alpha of 1 means that the
- /// pixel is not obscured in any way, and an alpha of 0 means that the
pixel is completely obscured.
- /// </summary>
- ComputeOcclusion = D3DX11_NORMALMAP_COMPUTE_OCCLUSION
- };
-
/// <summary>Specifies how the pipeline should interpret vertex data
bound to the input assembler stage.</summary>
/// <unmanaged>D3D11_PRIMITIVE_TOPOLOGY</unmanaged>
public enum class PrimitiveTopology : System::Int32
@@ -1782,81 +1572,6 @@
/// </summary>
Staging = D3D11_USAGE_STAGING
};
-
- /// <summary>Identifies the type for scan data.</summary>
- /// <unmanaged>D3DX11_SCAN_DATA_TYPE</unmanaged>
- public enum class ScanDataType : System::Int32
- {
- /// <summary>
- /// The type of the scan is float.
- /// </summary>
- Float = D3DX11_SCAN_DATA_TYPE_FLOAT,
-
- /// <summary>
- /// The type of the scan is int.
- /// </summary>
- Int = D3DX11_SCAN_DATA_TYPE_INT,
-
- /// <summary>
- /// The type of the scan is uint.
- /// </summary>
- UInt = D3DX11_SCAN_DATA_TYPE_UINT
- };
-
- /// <summary>Identifies the direction of scanning.</summary>
- /// <unmanaged>D3DX11_SCAN_DIRECTION</unmanaged>
- public enum class ScanDirection : System::Int32
- {
- /// <summary>
- /// The direction is forward.
- /// </summary>
- Forward = D3DX11_SCAN_DIRECTION_FORWARD,
-
- /// <summary>
- /// The direction is backward.
- /// </summary>
- Backward = D3DX11_SCAN_DIRECTION_BACKWARD
- };
-
- /// <summary>Identifies the operation for a scan.</summary>
- /// <unmanaged>D3DX11_SCAN_OPCODE</unmanaged>
- public enum class ScanOpCode : System::Int32
- {
- /// <summary>
- /// The operation is add.
- /// </summary>
- Add = D3DX11_SCAN_OPCODE_ADD,
-
- /// <summary>
- /// The operation is min.
- /// </summary>
- Min = D3DX11_SCAN_OPCODE_MIN,
-
- /// <summary>
- /// The operation is max.
- /// </summary>
- Max = D3DX11_SCAN_OPCODE_MAX,
-
- /// <summary>
- /// The operation is mul.
- /// </summary>
- Mul = D3DX11_SCAN_OPCODE_MUL,
-
- /// <summary>
- /// The operation is and.
- /// </summary>
- And = D3DX11_SCAN_OPCODE_AND,
-
- /// <summary>
- /// The operation is or.
- /// </summary>
- Or = D3DX11_SCAN_OPCODE_OR,
-
- /// <summary>
- /// The operation is XOR.
- /// </summary>
- XOR = D3DX11_SCAN_OPCODE_XOR
- };

/// <summary>Identifies the type of the resource that will be
viewed.</summary>
/// <unmanaged>D3D11_SRV_DIMENSION</unmanaged>
=======================================
--- /branches/lite/source/direct3d11/Resource11.cpp Sat Jan 28 10:03:11 2012
+++ /branches/lite/source/direct3d11/Resource11.cpp Sat Mar 17 12:07:17 2012
@@ -20,10 +20,6 @@
* OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
* THE SOFTWARE.
*/
-
-#include <d3d11.h>
-#include <d3dx11.h>
-
#include "../ObjectTable.h"
#include "../DataStream.h"

@@ -182,63 +178,5 @@

return (static_cast< int >(size));
}
-
- Result Resource::SaveTextureToFile( DeviceContext^ context, Resource^
resource, ImageFileFormat destinationFormat, String^ destinationFile )
- {
- pin_ptr<const wchar_t> pinnedName = PtrToStringChars( destinationFile );
- return RECORD_D3D11( D3DX11SaveTextureToFile( context->InternalPointer,
resource->InternalPointer, static_cast<D3DX11_IMAGE_FILE_FORMAT>(
destinationFormat ), pinnedName ) );
- }
-
- Result Resource::LoadTextureFromTexture(DeviceContext^ context, Resource^
source, Resource^ destination, TextureLoadInformation loadInformation)
- {
- HRESULT hr = D3DX11LoadTextureFromTexture(context->InternalPointer,
source->InternalPointer,
reinterpret_cast<D3DX11_TEXTURE_LOAD_INFO*>(&loadInformation),
destination->InternalPointer);
- return RECORD_D3D11(hr);
- }
-
- Result Resource::FilterTexture(DeviceContext^ context, Resource^ texture,
int sourceLevel, FilterFlags mipFilter)
- {
- HRESULT hr = D3DX11FilterTexture(context->InternalPointer,
texture->InternalPointer, sourceLevel, static_cast<UINT>(mipFilter));
- return RECORD_D3D11(hr);
- }
-
- ID3D11Resource* Resource::ConstructFromFile( SlimDX::Direct3D11::Device^
device, String^ fileName, D3DX11_IMAGE_LOAD_INFO* info )
- {
- ID3D11Resource* resource = 0;
- pin_ptr<const wchar_t> pinnedName = PtrToStringChars( fileName );
- HRESULT hr = D3DX11CreateTextureFromFile( device->InternalPointer,
pinnedName, info, 0, &resource, 0 );
- RECORD_D3D11( hr );
-
- return resource;
- }
-
- ID3D11Resource* Resource::ConstructFromMemory(
SlimDX::Direct3D11::Device^ device, array<Byte>^ memory,
D3DX11_IMAGE_LOAD_INFO* info )
- {
- pin_ptr<unsigned char> pinnedMemory = &memory[0];
-
- ID3D11Resource* resource = 0;
- HRESULT hr = D3DX11CreateTextureFromMemory( device->InternalPointer,
pinnedMemory, memory->Length, info, 0, &resource, 0 );
- RECORD_D3D11( hr );
-
- return resource;
- }
-
- ID3D11Resource* Resource::ConstructFromStream(
SlimDX::Direct3D11::Device^ device, Stream^ stream, int sizeInBytes,
D3DX11_IMAGE_LOAD_INFO* info )
- {
- DataStream^ ds = nullptr;
- array<Byte>^ memory = SlimDX::Utilities::ReadStream( stream,
sizeInBytes, &ds );
-
- if( memory == nullptr )
- {
- ID3D11Resource* resource = NULL;
- SIZE_T size = static_cast<SIZE_T>( ds->RemainingLength );
- HRESULT hr = D3DX11CreateTextureFromMemory( device->InternalPointer,
ds->SeekToEnd(), size,
- info, NULL, &resource, NULL );
- RECORD_D3D11( hr );
-
- return resource;
- }
-
- return ConstructFromMemory( device, memory, info );
- }
}
}
=======================================
--- /branches/lite/source/direct3d11/Resource11.h Sat Jan 28 10:03:11 2012
+++ /branches/lite/source/direct3d11/Resource11.h Sat Mar 17 12:07:17 2012
@@ -27,8 +27,6 @@
#include "../dxgi/SwapChainDxgi.h"
#include "../dxgi/SurfaceDxgi.h"

-#include "TextureLoadInformation11.h"
-
namespace SlimDX
{
namespace Direct3D11
@@ -43,11 +41,6 @@

internal:
static int GetMipSize( int mipSlice, int baseSliceSize );
-
- static ID3D11Resource* ConstructFromFile( SlimDX::Direct3D11::Device^
device, System::String^ fileName, D3DX11_IMAGE_LOAD_INFO* info );
- static ID3D11Resource* ConstructFromMemory( SlimDX::Direct3D11::Device^
device, array<System::Byte>^ memory, D3DX11_IMAGE_LOAD_INFO* info );
- static ID3D11Resource* ConstructFromStream( SlimDX::Direct3D11::Device^
device, System::IO::Stream^ stream, int sizeInBytes,
D3DX11_IMAGE_LOAD_INFO* info );
-
static Resource^ FromPointer( ID3D11Resource* pointer );

private protected:
@@ -103,28 +96,6 @@
/// <param name="mipLevels">The total number of mip levels.</param>
/// <returns>The subresource index (equivalent to mipSlice +
(arraySlice * mipLevels)).</returns>
static int CalculateSubresourceIndex( int mipSlice, int arraySlice, int
mipLevels );
-
- static Result SaveTextureToFile( DeviceContext^ context, Resource^
resource, ImageFileFormat destinationFormat, System::String^
desintationFile );
-
- /// <summary>
- /// Loads a texture from a texture.
- /// </summary>
- /// <param name="context">The device context used to load the
texture.</param>
- /// <param name="source">The source texture.</param>
- /// <param name="destination">The destination texture.</param>
- /// <param name="loadInformation">Texture loading parameters.</param>
- /// <returns>A <see cref="SlimDX::Result"/> object describing the
result of the operation.</returns>
- static Result LoadTextureFromTexture(DeviceContext^ context, Resource^
source, Resource^ destination, TextureLoadInformation loadInformation);
-
- /// <summary>
- /// Generates a mipmap chain using a particular texture filter.
- /// </summary>
- /// <param name="context">The device context used to generate the
mipmaps.</param>
- /// <param name="texture">The texture to be filtered.</param>
- /// <param name="sourceLevel">The mipmap level whose data is used to
generate the rest of the mipmap chain.</param>
- /// <param name="mipFilter">Flags controlling how each miplevel is
filtered.</param>
- /// <returns>A <see cref="SlimDX::Result"/> object describing the
result of the operation.</returns>
- static Result FilterTexture(DeviceContext^ context, Resource^ texture,
int sourceLevel, FilterFlags mipFilter);
};
}
};
=======================================
--- /branches/lite/source/direct3d11/SamplerState11.cpp Sat Jan 28 10:03:11
2012
+++ /branches/lite/source/direct3d11/SamplerState11.cpp Sat Mar 17 12:07:17
2012
@@ -21,12 +21,6 @@
*/
#include "stdafx.h"

-#include <d3d11.h>
-#include <d3dx11.h>
-#include <d3dx9.h>
-#include <vcclr.h>
-#include <cmath>
-
#include "Direct3D11Exception.h"

#include "Device11.h"
=======================================
--- /branches/lite/source/direct3d11/ShaderResourceView11.cpp Sat Jan 28
10:03:11 2012
+++ /branches/lite/source/direct3d11/ShaderResourceView11.cpp Sat Mar 17
12:07:17 2012
@@ -20,10 +20,6 @@
* OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
* THE SOFTWARE.
*/
-
-#include <d3d11.h>
-#include <d3dx11.h>
-
#include "../DataStream.h"

#include "Direct3D11Exception.h"
@@ -75,102 +71,5 @@
InternalPointer->GetDesc( &nativeDescription );
return ShaderResourceViewDescription( nativeDescription );
}
-
- ShaderResourceView^
ShaderResourceView::FromFile(SlimDX::Direct3D11::Device^ device,
System::String^ fileName)
- {
- ID3D11ShaderResourceView* resource = ConstructFromFile( device,
fileName, 0 );
- if( resource == 0 )
- return nullptr;
-
- return ShaderResourceView::FromPointer(
static_cast<ID3D11ShaderResourceView*>( resource ) );
- }
-
- ShaderResourceView^
ShaderResourceView::FromFile(SlimDX::Direct3D11::Device^ device,
System::String^ fileName, ImageLoadInformation loadInformation)
- {
- D3DX11_IMAGE_LOAD_INFO info = loadInformation.CreateNativeVersion();
- ID3D11ShaderResourceView* resource = ConstructFromFile( device,
fileName, &info );
- if( resource == 0 )
- return nullptr;
-
- return ShaderResourceView::FromPointer(
static_cast<ID3D11ShaderResourceView*>( resource ) );
- }
-
- ShaderResourceView^ ShaderResourceView::FromMemory(
SlimDX::Direct3D11::Device^ device, array<System::Byte>^ memory )
- {
- ID3D11ShaderResourceView* resource = ConstructFromMemory( device,
memory, NULL );
- if( resource == 0 )
- return nullptr;
-
- return ShaderResourceView::FromPointer(
static_cast<ID3D11ShaderResourceView*>( resource ) );
- }
-
- ShaderResourceView^ ShaderResourceView::FromMemory(
SlimDX::Direct3D11::Device^ device, array<System::Byte>^ memory,
ImageLoadInformation loadInfo )
- {
- D3DX11_IMAGE_LOAD_INFO info = loadInfo.CreateNativeVersion();
- ID3D11ShaderResourceView* resource = ConstructFromMemory( device,
memory, &info );
- if( resource == 0 )
- return nullptr;
-
- return ShaderResourceView::FromPointer(
static_cast<ID3D11ShaderResourceView*>( resource ) );
- }
-
- ShaderResourceView^ ShaderResourceView::FromStream(
SlimDX::Direct3D11::Device^ device, System::IO::Stream^ stream, int
sizeInBytes )
- {
- ID3D11ShaderResourceView* resource = ConstructFromStream( device,
stream, sizeInBytes, NULL );
- if( resource == 0 )
- return nullptr;
-
- return ShaderResourceView::FromPointer(
static_cast<ID3D11ShaderResourceView*>( resource ) );
- }
-
- ShaderResourceView^ ShaderResourceView::FromStream(
SlimDX::Direct3D11::Device^ device, System::IO::Stream^ stream, int
sizeInBytes, ImageLoadInformation loadInfo )
- {
- D3DX11_IMAGE_LOAD_INFO info = loadInfo.CreateNativeVersion();
- ID3D11ShaderResourceView* resource = ConstructFromStream( device,
stream, sizeInBytes, &info );
- if( resource == 0 )
- return nullptr;
-
- return ShaderResourceView::FromPointer(
static_cast<ID3D11ShaderResourceView*>( resource ) );
- }
-
- ID3D11ShaderResourceView*
ShaderResourceView::ConstructFromFile(SlimDX::Direct3D11::Device^ device,
System::String^ fileName, D3DX11_IMAGE_LOAD_INFO* loadInformation)
- {
- ID3D11ShaderResourceView* resource = 0;
- pin_ptr<const wchar_t> pinnedName = PtrToStringChars( fileName );
- HRESULT hr = D3DX11CreateShaderResourceViewFromFile(
device->InternalPointer, pinnedName, loadInformation, 0, &resource, 0 );
- RECORD_D3D11( hr );
-
- return resource;
- }
-
- ID3D11ShaderResourceView*
ShaderResourceView::ConstructFromMemory(SlimDX::Direct3D11::Device^ device,
array<Byte>^ memory, D3DX11_IMAGE_LOAD_INFO* loadInformation)
- {
- ID3D11ShaderResourceView* resource = 0;
- pin_ptr<unsigned char> pinnedMemory = &memory[0];
-
- HRESULT hr = D3DX11CreateShaderResourceViewFromMemory(
device->InternalPointer, pinnedMemory, memory->Length, loadInformation, 0,
&resource, 0 );
- RECORD_D3D11( hr );
-
- return resource;
- }
-
- ID3D11ShaderResourceView* ShaderResourceView::ConstructFromStream(
SlimDX::Direct3D11::Device^ device, Stream^ stream, int sizeInBytes,
D3DX11_IMAGE_LOAD_INFO* info )
- {
- DataStream^ ds = nullptr;
- array<Byte>^ memory = SlimDX::Utilities::ReadStream( stream,
sizeInBytes, &ds );
-
- if( memory == nullptr )
- {
- ID3D11ShaderResourceView* resource = NULL;
- SIZE_T size = static_cast<SIZE_T>( ds->RemainingLength );
-
- HRESULT hr = D3DX11CreateShaderResourceViewFromMemory(
device->InternalPointer, ds->SeekToEnd(), size, info, NULL, &resource, NULL
);
- RECORD_D3D11( hr );
-
- return resource;
- }
-
- return ConstructFromMemory( device, memory, info );
- }
}
}
=======================================
--- /branches/lite/source/direct3d11/ShaderResourceView11.h Sat Jan 28
10:03:11 2012
+++ /branches/lite/source/direct3d11/ShaderResourceView11.h Sat Mar 17
12:07:17 2012
@@ -22,7 +22,6 @@
#pragma once

#include "ResourceView11.h"
-#include "ImageLoadInformation11.h"

namespace SlimDX
{
@@ -38,10 +37,6 @@
{
COMOBJECT(ID3D11ShaderResourceView, ShaderResourceView);

- static ID3D11ShaderResourceView* ConstructFromFile(
SlimDX::Direct3D11::Device^ device, System::String^ fileName,
D3DX11_IMAGE_LOAD_INFO* loadInformation );
- static ID3D11ShaderResourceView* ConstructFromMemory(
SlimDX::Direct3D11::Device^ device, array<System::Byte>^ memory,
D3DX11_IMAGE_LOAD_INFO* loadInformation );
- static ID3D11ShaderResourceView* ConstructFromStream(
SlimDX::Direct3D11::Device^ device, System::IO::Stream^ stream, int
sizeInBytes, D3DX11_IMAGE_LOAD_INFO* loadInformation );
-
public:
/// <summary>Creates a <see cref="ShaderResourceView" /> for accessing
resource data.</summary>
/// <param name="device">The device to use when creating this <see
cref="ShaderResourceView" />.</param>
@@ -62,59 +57,6 @@
{
ShaderResourceViewDescription get();
}
-
- /// <summary>
- /// Creates a shader resource view from a file.
- /// </summary>
- /// <param name="device">The device that will own the resource.</param>
- /// <param name="fileName">The name of the file that contains the
shader resource view.</param>
- /// <returns>The created resource view.</returns>
- static ShaderResourceView^ FromFile( SlimDX::Direct3D11::Device^
device, System::String^ fileName );
-
- /// <summary>
- /// Creates a shader resource view from a file.
- /// </summary>
- /// <param name="device">The device that will own the resource.</param>
- /// <param name="fileName">The name of the file that contains the
shader resource view.</param>
- /// <param name="loadInformation">Identifies characteristics of the
texture to be loaded.</param>
- /// <returns>The created resource view.</returns>
- static ShaderResourceView^ FromFile( SlimDX::Direct3D11::Device^
device, System::String^ fileName, ImageLoadInformation loadInformation );
-
- /// <summary>
- /// Creates a shader resource view from memory.
- /// </summary>
- /// <param name="device">The device that will own the resource.</param>
- /// <param name="memory">The block of memory that contains the shader
resource view.</param>
- /// <returns>The created resource view.</returns>
- static ShaderResourceView^ FromMemory( SlimDX::Direct3D11::Device^
device, array<System::Byte>^ memory );
-
- /// <summary>
- /// Creates a shader resource view from memory.
- /// </summary>
- /// <param name="device">The device that will own the resource.</param>
- /// <param name="memory">The block of memory that contains the shader
resource view.</param>
- /// <param name="loadInfo">Identifies characteristics of the texture to
be loaded.</param>
- /// <returns>The created resource view.</returns>
- static ShaderResourceView^ FromMemory( SlimDX::Direct3D11::Device^
device, array<System::Byte>^ memory, ImageLoadInformation loadInfo );
-
- /// <summary>
- /// Creates a shader resource view from a stream.
- /// </summary>
- /// <param name="device">The device that will own the resource.</param>
- /// <param name="stream">The stream that contains the shader resource
view.</param>
- /// <param name="sizeInBytes">Size of the shader resource, in
bytes.</param>
- /// <returns>The created resource view.</returns>
- static ShaderResourceView^ FromStream( SlimDX::Direct3D11::Device^
device, System::IO::Stream^ stream, int sizeInBytes );
-
- /// <summary>
- /// Creates a shader resource view from a stream.
- /// </summary>
- /// <param name="device">The device that will own the resource.</param>
- /// <param name="stream">The stream that contains the shader resource
view.</param>
- /// <param name="sizeInBytes">Size of the shader resource, in
bytes.</param>
- /// <param name="loadInfo">Identifies characteristics of the texture to
be loaded.</param>
- /// <returns>The created resource view.</returns>
- static ShaderResourceView^ FromStream( SlimDX::Direct3D11::Device^
device, System::IO::Stream^ stream, int sizeInBytes, ImageLoadInformation
loadInfo );
};
}
};
=======================================
--- /branches/lite/source/direct3d11/Texture1D11.cpp Sat Jan 28 10:03:11
2012
+++ /branches/lite/source/direct3d11/Texture1D11.cpp Sat Mar 17 12:07:17
2012
@@ -91,116 +91,5 @@
InternalPointer->GetDesc( &nativeDescription );
return Texture1DDescription( nativeDescription );
}
-
- Texture1D^ Texture1D::FromFile( SlimDX::Direct3D11::Device^ device,
String^ fileName )
- {
- ID3D11Resource* resource = Resource::ConstructFromFile( device,
fileName, 0 );
- if( resource == 0 )
- return nullptr;
-
- D3D11_RESOURCE_DIMENSION type;
- resource->GetType( &type );
- if( type != D3D11_RESOURCE_DIMENSION_TEXTURE1D )
- throw gcnew InvalidOperationException( "Could not load file as 1D
texture." );
-
- return Texture1D::FromPointer( static_cast<ID3D11Texture1D*>( resource )
);
- }
-
- Texture1D^ Texture1D::FromMemory( SlimDX::Direct3D11::Device^ device,
array<Byte>^ memory )
- {
- ID3D11Resource* resource = Resource::ConstructFromMemory( device,
memory, 0 );
- if( resource == 0 )
- return nullptr;
-
- D3D11_RESOURCE_DIMENSION type;
- resource->GetType( &type );
- if( type != D3D11_RESOURCE_DIMENSION_TEXTURE1D )
- throw gcnew InvalidOperationException( "Could not load file as 1D
texture." );
-
- return Texture1D::FromPointer( static_cast<ID3D11Texture1D*>( resource )
);
- }
-
- Texture1D^ Texture1D::FromStream( SlimDX::Direct3D11::Device^ device,
Stream^ stream, int sizeInBytes )
- {
- ID3D11Resource* resource = Resource::ConstructFromStream( device,
stream, sizeInBytes, 0 );
- if( resource == 0 )
- return nullptr;
-
- D3D11_RESOURCE_DIMENSION type;
- resource->GetType( &type );
- if( type != D3D11_RESOURCE_DIMENSION_TEXTURE1D )
- throw gcnew InvalidOperationException( "Could not load file as 1D
texture." );
-
- return Texture1D::FromPointer( static_cast<ID3D11Texture1D*>( resource )
);
- }
-
- Texture1D^ Texture1D::FromFile( SlimDX::Direct3D11::Device^ device,
String^ fileName, ImageLoadInformation loadInfo )
- {
- D3DX11_IMAGE_LOAD_INFO info = loadInfo.CreateNativeVersion();
- ID3D11Resource* resource = Resource::ConstructFromFile( device,
fileName, &info );
- if( resource == 0 )
- return nullptr;
-
- D3D11_RESOURCE_DIMENSION type;
- resource->GetType( &type );
- if( type != D3D11_RESOURCE_DIMENSION_TEXTURE1D )
- throw gcnew InvalidOperationException( "Could not load file as 1D
texture." );
-
- return Texture1D::FromPointer( static_cast<ID3D11Texture1D*>( resource )
);
- }
-
- Texture1D^ Texture1D::FromMemory( SlimDX::Direct3D11::Device^ device,
array<Byte>^ memory, ImageLoadInformation loadInfo )
- {
- D3DX11_IMAGE_LOAD_INFO info = loadInfo.CreateNativeVersion();
- ID3D11Resource* resource = Resource::ConstructFromMemory( device,
memory, &info );
- if( resource == 0 )
- return nullptr;
-
- D3D11_RESOURCE_DIMENSION type;
- resource->GetType( &type );
- if( type != D3D11_RESOURCE_DIMENSION_TEXTURE1D )
- throw gcnew InvalidOperationException( "Could not load file as 1D
texture." );
-
- return Texture1D::FromPointer( static_cast<ID3D11Texture1D*>( resource )
);
- }
-
- Texture1D^ Texture1D::FromStream( SlimDX::Direct3D11::Device^ device,
Stream^ stream, int sizeInBytes, ImageLoadInformation loadInfo )
- {
- D3DX11_IMAGE_LOAD_INFO info = loadInfo.CreateNativeVersion();
- ID3D11Resource* resource = Resource::ConstructFromStream( device,
stream, sizeInBytes, &info );
- if( resource == 0 )
- return nullptr;
-
- D3D11_RESOURCE_DIMENSION type;
- resource->GetType( &type );
- if( type != D3D11_RESOURCE_DIMENSION_TEXTURE1D )
- throw gcnew InvalidOperationException( "Could not load file as 1D
texture." );
-
- return Texture1D::FromPointer( static_cast<ID3D11Texture1D*>( resource )
);
- }
-
- Result Texture1D::ToFile( DeviceContext^ context, Texture1D^ texture,
ImageFileFormat format, String^ fileName )
- {
- pin_ptr<const wchar_t> pinnedName = PtrToStringChars( fileName );
-
- HRESULT hr = D3DX11SaveTextureToFile( context->InternalPointer,
texture->InternalPointer, static_cast<D3DX11_IMAGE_FILE_FORMAT>( format ),
pinnedName );
- return RECORD_D3D11( hr );
- }
-
- Result Texture1D::ToStream( DeviceContext^ context, Texture1D^ texture,
ImageFileFormat format, Stream^ stream )
- {
- ID3D10Blob* blob = 0;
- HRESULT hr = D3DX11SaveTextureToMemory( context->InternalPointer,
texture->InternalPointer, static_cast<D3DX11_IMAGE_FILE_FORMAT>( format ),
&blob, 0 );
- if( RECORD_D3D11( hr ).IsFailure )
- return Result::Last;
-
- // Write byte-by-byte to avoid allocating a managed byte[] that will
wastefully persist.
- unsigned char* bytes = reinterpret_cast<unsigned char*>(
blob->GetBufferPointer() );
- for(SIZE_T byteIndex = 0; byteIndex < blob->GetBufferSize(); ++byteIndex)
- stream->WriteByte( bytes[byteIndex] );
-
- blob->Release();
- return Result::Last;
- }
}
}
=======================================
--- /branches/lite/source/direct3d11/Texture1D11.h Sat Jan 28 10:03:11 2012
+++ /branches/lite/source/direct3d11/Texture1D11.h Sat Mar 17 12:07:17 2012
@@ -23,7 +23,6 @@

#include "Enums11.h"
#include "Resource11.h"
-#include "ImageLoadInformation11.h"

namespace SlimDX
{
@@ -77,79 +76,6 @@
/// <param name="description">The description of the texture.</param>
/// <param name="data">An array of initial texture data for each
subresource.</param>
Texture1D( SlimDX::Direct3D11::Device^ device, Texture1DDescription
description, array<DataStream^>^ data );
-
- /// <summary>
- /// Loads a texture from an image file.
- /// </summary>
- /// <param name="device">The device used to load the texture.</param>
- /// <param name="fileName">Path to the file on disk.</param>
- /// <returns>The loaded texture object.</returns>
- static Texture1D^ FromFile( SlimDX::Direct3D11::Device^ device,
System::String^ fileName );
-
- /// <summary>
- /// Loads a texture from an image file.
- /// </summary>
- /// <param name="device">The device used to load the texture.</param>
- /// <param name="fileName">Path to the file on disk.</param>
- /// <param name="loadInfo">Specifies information used to load the
texture.</param>
- /// <returns>The loaded texture object.</returns>
- static Texture1D^ FromFile( SlimDX::Direct3D11::Device^ device,
System::String^ fileName, ImageLoadInformation loadInfo );
-
- /// <summary>
- /// Loads a texture from an image in memory.
- /// </summary>
- /// <param name="device">The device used to load the texture.</param>
- /// <param name="memory">Array of memory containing the image data to
load.</param>
- /// <returns>The loaded texture object.</returns>
- static Texture1D^ FromMemory( SlimDX::Direct3D11::Device^ device,
array<System::Byte>^ memory );
-
- /// <summary>
- /// Loads a texture from an image in memory.
- /// </summary>
- /// <param name="device">The device used to load the texture.</param>
- /// <param name="memory">Array of memory containing the image data to
load.</param>
- /// <param name="loadInfo">Specifies information used to load the
texture.</param>
- /// <returns>The loaded texture object.</returns>
- static Texture1D^ FromMemory( SlimDX::Direct3D11::Device^ device,
array<System::Byte>^ memory, ImageLoadInformation loadInfo );
-
- /// <summary>
- /// Loads a texture from a stream of data.
- /// </summary>
- /// <param name="device">The device used to load the texture.</param>
- /// <param name="stream">A stream containing the image data to
load.</param>
- /// <param name="sizeInBytes">Size of the image to load.</param>
- /// <returns>The loaded texture object.</returns>
- static Texture1D^ FromStream( SlimDX::Direct3D11::Device^ device,
System::IO::Stream^ stream, int sizeInBytes );
-
- /// <summary>
- /// Loads a texture from a stream of data.
- /// </summary>
- /// <param name="device">The device used to load the texture.</param>
- /// <param name="stream">A stream containing the image data to
load.</param>
- /// <param name="sizeInBytes">Size of the image to load.</param>
- /// <param name="loadInfo">Specifies information used to load the
texture.</param>
- /// <returns>The loaded texture object.</returns>
- static Texture1D^ FromStream( SlimDX::Direct3D11::Device^ device,
System::IO::Stream^ stream, int sizeInBytes, ImageLoadInformation loadInfo
);
-
- /// <summary>
- /// Saves a texture to file.
- /// </summary>
- /// <param name="context">The device used to save the texture.</param>
- /// <param name="texture">The texture to save.</param>
- /// <param name="format">The format the texture will be saved
as.</param>
- /// <param name="fileName">Name of the destination output file where
the texture will be saved.</param>
- /// <returns>A <see cref="SlimDX::Result"/> object describing the
result of the operation.</returns>
- static Result ToFile( DeviceContext^ context, Texture1D^ texture,
ImageFileFormat format, System::String^ fileName );
-
- /// <summary>
- /// Saves a texture to a stream.
- /// </summary>
- /// <param name="context">The device used to save the texture.</param>
- /// <param name="texture">The texture to save.</param>
- /// <param name="format">The format the texture will be saved
as.</param>
- /// <param name="stream">Destination memory stream where the image will
be saved.</param>
- /// <returns>A <see cref="SlimDX::Result"/> object describing the
result of the operation.</returns>
- static Result ToStream( DeviceContext^ context, Texture1D^ texture,
ImageFileFormat format, System::IO::Stream^ stream );
};
}
};
=======================================
--- /branches/lite/source/direct3d11/Texture2D11.cpp Sat Jan 28 10:03:11
2012
+++ /branches/lite/source/direct3d11/Texture2D11.cpp Sat Mar 17 12:07:17
2012
@@ -97,122 +97,5 @@
InternalPointer->GetDesc( &nativeDescription );
return Texture2DDescription( nativeDescription );
}
-
- Texture2D^ Texture2D::FromFile( SlimDX::Direct3D11::Device^ device,
String^ fileName )
- {
- ID3D11Resource* resource = Resource::ConstructFromFile( device,
fileName, 0 );
- if( resource == 0 )
- return nullptr;
-
- D3D11_RESOURCE_DIMENSION type;
- resource->GetType( &type );
- if( type != D3D11_RESOURCE_DIMENSION_TEXTURE2D )
- throw gcnew InvalidOperationException( "Could not load file as 2D
texture." );
-
- return Texture2D::FromPointer( static_cast<ID3D11Texture2D*>( resource )
);
- }
-
- Texture2D^ Texture2D::FromMemory( SlimDX::Direct3D11::Device^ device,
array<Byte>^ memory )
- {
- ID3D11Resource* resource = Resource::ConstructFromMemory( device,
memory, 0 );
- if( resource == 0 )
- return nullptr;
-
- D3D11_RESOURCE_DIMENSION type;
- resource->GetType( &type );
- if( type != D3D11_RESOURCE_DIMENSION_TEXTURE2D )
- throw gcnew InvalidOperationException( "Could not load file as 2D
texture." );
-
- return Texture2D::FromPointer( static_cast<ID3D11Texture2D*>( resource )
);
- }
-
- Texture2D^ Texture2D::FromStream( SlimDX::Direct3D11::Device^ device,
Stream^ stream, int sizeInBytes )
- {
- ID3D11Resource* resource = Resource::ConstructFromStream( device,
stream, sizeInBytes, 0 );
- if( resource == 0 )
- return nullptr;
-
- D3D11_RESOURCE_DIMENSION type;
- resource->GetType( &type );
- if( type != D3D11_RESOURCE_DIMENSION_TEXTURE2D )
- throw gcnew InvalidOperationException( "Could not load file as 2D
texture." );
-
- return Texture2D::FromPointer( static_cast<ID3D11Texture2D*>( resource )
);
- }
-
- Texture2D^ Texture2D::FromFile( SlimDX::Direct3D11::Device^ device,
String^ fileName, ImageLoadInformation loadInfo )
- {
- D3DX11_IMAGE_LOAD_INFO info = loadInfo.CreateNativeVersion();
- ID3D11Resource* resource = Resource::ConstructFromFile( device,
fileName, &info );
- if( resource == 0 )
- return nullptr;
-
- D3D11_RESOURCE_DIMENSION type;
- resource->GetType( &type );
- if( type != D3D11_RESOURCE_DIMENSION_TEXTURE2D )
- throw gcnew InvalidOperationException( "Could not load file as 2D
texture." );
-
- return Texture2D::FromPointer( static_cast<ID3D11Texture2D*>( resource )
);
- }
-
- Texture2D^ Texture2D::FromMemory( SlimDX::Direct3D11::Device^ device,
array<Byte>^ memory, ImageLoadInformation loadInfo )
- {
- D3DX11_IMAGE_LOAD_INFO info = loadInfo.CreateNativeVersion();
- ID3D11Resource* resource = Resource::ConstructFromMemory( device,
memory, &info );
- if( resource == 0 )
- return nullptr;
-
- D3D11_RESOURCE_DIMENSION type;
- resource->GetType( &type );
- if( type != D3D11_RESOURCE_DIMENSION_TEXTURE2D )
- throw gcnew InvalidOperationException( "Could not load file as 2D
texture." );
-
- return Texture2D::FromPointer( static_cast<ID3D11Texture2D*>( resource )
);
- }
-
- Texture2D^ Texture2D::FromStream( SlimDX::Direct3D11::Device^ device,
Stream^ stream, int sizeInBytes, ImageLoadInformation loadInfo )
- {
- D3DX11_IMAGE_LOAD_INFO info = loadInfo.CreateNativeVersion();
- ID3D11Resource* resource = Resource::ConstructFromStream( device,
stream, sizeInBytes, &info );
- if( resource == 0 )
- return nullptr;
-
- D3D11_RESOURCE_DIMENSION type;
- resource->GetType( &type );
- if( type != D3D11_RESOURCE_DIMENSION_TEXTURE2D )
- throw gcnew InvalidOperationException( "Could not load file as 2D
texture." );
-
- return Texture2D::FromPointer( static_cast<ID3D11Texture2D*>( resource )
);
- }
-
- Result Texture2D::ToFile( DeviceContext^ context, Texture2D^ texture,
ImageFileFormat format, String^ fileName )
- {
- pin_ptr<const wchar_t> pinnedName = PtrToStringChars( fileName );
-
- HRESULT hr = D3DX11SaveTextureToFile( context->InternalPointer,
texture->InternalPointer, static_cast<D3DX11_IMAGE_FILE_FORMAT>( format ),
pinnedName );
- return RECORD_D3D11( hr );
- }
-
- Result Texture2D::ToStream( DeviceContext^ context, Texture2D^ texture,
ImageFileFormat format, Stream^ stream )
- {
- ID3D10Blob* blob = 0;
- HRESULT hr = D3DX11SaveTextureToMemory( context->InternalPointer,
texture->InternalPointer, static_cast<D3DX11_IMAGE_FILE_FORMAT>( format ),
&blob, 0 );
- if( RECORD_D3D11( hr ).IsFailure )
- return Result::Last;
-
- // Write byte-by-byte to avoid allocating a managed byte[] that will
wastefully persist.
- unsigned char* bytes = reinterpret_cast<unsigned char*>(
blob->GetBufferPointer() );
- for(SIZE_T byteIndex = 0; byteIndex < blob->GetBufferSize(); ++byteIndex)
- stream->WriteByte( bytes[byteIndex] );
-
- blob->Release();
- return Result::Last;
- }
-
- Result Texture2D::ComputeNormalMap(DeviceContext^ context, Texture2D^
source, Texture2D^ destination, NormalMapFlags flags, Channel channel,
float amplitude)
- {
- HRESULT hr = D3DX11ComputeNormalMap(context->InternalPointer,
source->InternalPointer, static_cast<UINT>(flags),
static_cast<UINT>(channel), amplitude, destination->InternalPointer);
- return RECORD_D3D11(hr);
- }
}
}
=======================================
--- /branches/lite/source/direct3d11/Texture2D11.h Sat Jan 28 10:03:11 2012
+++ /branches/lite/source/direct3d11/Texture2D11.h Sat Mar 17 12:07:17 2012
@@ -23,7 +23,6 @@

#include "Enums11.h"
#include "Resource11.h"
-#include "ImageLoadInformation11.h"

namespace SlimDX
{
@@ -77,91 +76,6 @@
/// <param name="description">The description of the texture.</param>
/// <param name="data">An array of initial texture data for each
subresource.</param>
Texture2D( SlimDX::Direct3D11::Device^ device, Texture2DDescription
description, array<DataRectangle^>^ data );
-
- /// <summary>
- /// Loads a texture from an image file.
- /// </summary>
- /// <param name="device">The device used to load the texture.</param>
- /// <param name="fileName">Path to the file on disk.</param>
- /// <returns>The loaded texture object.</returns>
- static Texture2D^ FromFile( SlimDX::Direct3D11::Device^ device,
System::String^ fileName );
-
- /// <summary>
- /// Loads a texture from an image file.
- /// </summary>
- /// <param name="device">The device used to load the texture.</param>
- /// <param name="fileName">Path to the file on disk.</param>
- /// <param name="loadInfo">Specifies information used to load the
texture.</param>
- /// <returns>The loaded texture object.</returns>
- static Texture2D^ FromFile( SlimDX::Direct3D11::Device^ device,
System::String^ fileName, ImageLoadInformation loadInfo );
-
- /// <summary>
- /// Loads a texture from an image in memory.
- /// </summary>
- /// <param name="device">The device used to load the texture.</param>
- /// <param name="memory">Array of memory containing the image data to
load.</param>
- /// <returns>The loaded texture object.</returns>
- static Texture2D^ FromMemory( SlimDX::Direct3D11::Device^ device,
array<System::Byte>^ memory );
-
- /// <summary>
- /// Loads a texture from an image in memory.
- /// </summary>
- /// <param name="device">The device used to load the texture.</param>
- /// <param name="memory">Array of memory containing the image data to
load.</param>
- /// <param name="loadInfo">Specifies information used to load the
texture.</param>
- /// <returns>The loaded texture object.</returns>
- static Texture2D^ FromMemory( SlimDX::Direct3D11::Device^ device,
array<System::Byte>^ memory, ImageLoadInformation loadInfo );
-
- /// <summary>
- /// Loads a texture from a stream of data.
- /// </summary>
- /// <param name="device">The device used to load the texture.</param>
- /// <param name="stream">A stream containing the image data to
load.</param>
- /// <param name="sizeInBytes">Size of the image to load.</param>
- /// <returns>The loaded texture object.</returns>
- static Texture2D^ FromStream( SlimDX::Direct3D11::Device^ device,
System::IO::Stream^ stream, int sizeInBytes );
-
- /// <summary>
- /// Loads a texture from a stream of data.
- /// </summary>
- /// <param name="device">The device used to load the texture.</param>
- /// <param name="stream">A stream containing the image data to
load.</param>
- /// <param name="sizeInBytes">Size of the image to load.</param>
- /// <param name="loadInfo">Specifies information used to load the
texture.</param>
- /// <returns>The loaded texture object.</returns>
- static Texture2D^ FromStream( SlimDX::Direct3D11::Device^ device,
System::IO::Stream^ stream, int sizeInBytes, ImageLoadInformation loadInfo
);
-
- /// <summary>
- /// Saves a texture to file.
- /// </summary>
- /// <param name="context">The device used to save the texture.</param>
- /// <param name="texture">The texture to save.</param>
- /// <param name="format">The format the texture will be saved
as.</param>
- /// <param name="fileName">Name of the destination output file where
the texture will be saved.</param>
- /// <returns>A <see cref="SlimDX::Result"/> object describing the
result of the operation.</returns>
- static Result ToFile( DeviceContext^ context, Texture2D^ texture,
ImageFileFormat format, System::String^ fileName );
-
- /// <summary>
- /// Saves a texture to a stream.
- /// </summary>
- /// <param name="context">The device used to save the texture.</param>
- /// <param name="texture">The texture to save.</param>
- /// <param name="format">The format the texture will be saved
as.</param>
- /// <param name="stream">Destination memory stream where the image will
be saved.</param>
- /// <returns>A <see cref="SlimDX::Result"/> object describing the
result of the operation.</returns>
- static Result ToStream( DeviceContext^ context, Texture2D^ texture,
ImageFileFormat format, System::IO::Stream^ stream );
-
- /// <summary>
- /// Converts a height map into a normal map. The (x,y,z) components of
each normal are mapped to the (r,g,b) channels of the output texture.
- /// </summary>
- /// <param name="context">The device used to create the normal
map.</param>
- /// <param name="source">The source height map texture.</param>
- /// <param name="destination">The destination texture.</param>
- /// <param name="flags">One or more flags that control generation of
normal maps.</param>
- /// <param name="channel">One or more flag specifying the source of
height information.</param>
- /// <param name="amplitude">Constant value multiplier that increases
(or decreases) the values in the normal map. Higher values usually make
bumps more visible, lower values usually make bumps less visible.</param>
- /// <returns>A <see cref="SlimDX::Result"/> object describing the
result of the operation.</returns>
- static Result ComputeNormalMap(DeviceContext^ context, Texture2D^
source, Texture2D^ destination, NormalMapFlags flags, Channel channel,
float amplitude);
};
}
};
=======================================
--- /branches/lite/source/direct3d11/Texture3D11.cpp Sat Jan 28 10:03:11
2012
+++ /branches/lite/source/direct3d11/Texture3D11.cpp Sat Mar 17 12:07:17
2012
@@ -99,116 +99,5 @@
InternalPointer->GetDesc( &nativeDescription );
return Texture3DDescription( nativeDescription );
}
-
- Texture3D^ Texture3D::FromFile( SlimDX::Direct3D11::Device^ device,
String^ fileName )
- {
- ID3D11Resource* resource = Resource::ConstructFromFile( device,
fileName, 0 );
- if( resource == 0 )
- return nullptr;
-
- D3D11_RESOURCE_DIMENSION type;
- resource->GetType( &type );
- if( type != D3D11_RESOURCE_DIMENSION_TEXTURE3D )
- throw gcnew InvalidOperationException( "Could not load file as 3D
texture." );
-
- return Texture3D::FromPointer( static_cast<ID3D11Texture3D*>( resource )
);
- }
-
- Texture3D^ Texture3D::FromMemory( SlimDX::Direct3D11::Device^ device,
array<Byte>^ memory )
- {
- ID3D11Resource* resource = Resource::ConstructFromMemory( device,
memory, 0 );
- if( resource == 0 )
- return nullptr;
-
- D3D11_RESOURCE_DIMENSION type;
- resource->GetType( &type );
- if( type != D3D11_RESOURCE_DIMENSION_TEXTURE3D )
- throw gcnew InvalidOperationException( "Could not load file as 3D
texture." );
-
- return Texture3D::FromPointer( static_cast<ID3D11Texture3D*>( resource )
);
- }
-
- Texture3D^ Texture3D::FromStream( SlimDX::Direct3D11::Device^ device,
Stream^ stream, int sizeInBytes )
- {
- ID3D11Resource* resource = Resource::ConstructFromStream( device,
stream, sizeInBytes, 0 );
- if( resource == 0 )
- return nullptr;
-
- D3D11_RESOURCE_DIMENSION type;
- resource->GetType( &type );
- if( type != D3D11_RESOURCE_DIMENSION_TEXTURE3D )
- throw gcnew InvalidOperationException( "Could not load file as 3D
texture." );
-
- return Texture3D::FromPointer( static_cast<ID3D11Texture3D*>( resource )
);
- }
-
- Texture3D^ Texture3D::FromFile( SlimDX::Direct3D11::Device^ device,
String^ fileName, ImageLoadInformation loadInfo )
- {
- D3DX11_IMAGE_LOAD_INFO info = loadInfo.CreateNativeVersion();
- ID3D11Resource* resource = Resource::ConstructFromFile( device,
fileName, &info );
- if( resource == 0 )
- return nullptr;
-
- D3D11_RESOURCE_DIMENSION type;
- resource->GetType( &type );
- if( type != D3D11_RESOURCE_DIMENSION_TEXTURE3D )
- throw gcnew InvalidOperationException( "Could not load file as 3D
texture." );
-
- return Texture3D::FromPointer( static_cast<ID3D11Texture3D*>( resource )
);
- }
-
- Texture3D^ Texture3D::FromMemory( SlimDX::Direct3D11::Device^ device,
array<Byte>^ memory, ImageLoadInformation loadInfo )
- {
- D3DX11_IMAGE_LOAD_INFO info = loadInfo.CreateNativeVersion();
- ID3D11Resource* resource = Resource::ConstructFromMemory( device,
memory, &info );
- if( resource == 0 )
- return nullptr;
-
- D3D11_RESOURCE_DIMENSION type;
- resource->GetType( &type );
- if( type != D3D11_RESOURCE_DIMENSION_TEXTURE3D )
- throw gcnew InvalidOperationException( "Could not load file as 3D
texture." );
-
- return Texture3D::FromPointer( static_cast<ID3D11Texture3D*>( resource )
);
- }
-
- Texture3D^ Texture3D::FromStream( SlimDX::Direct3D11::Device^ device,
Stream^ stream, int sizeInBytes, ImageLoadInformation loadInfo )
- {
- D3DX11_IMAGE_LOAD_INFO info = loadInfo.CreateNativeVersion();
- ID3D11Resource* resource = Resource::ConstructFromStream( device,
stream, sizeInBytes, &info );
- if( resource == 0 )
- return nullptr;
-
- D3D11_RESOURCE_DIMENSION type;
- resource->GetType( &type );
- if( type != D3D11_RESOURCE_DIMENSION_TEXTURE3D )
- throw gcnew InvalidOperationException( "Could not load file as 3D
texture." );
-
- return Texture3D::FromPointer( static_cast<ID3D11Texture3D*>( resource )
);
- }
-
- Result Texture3D::ToFile( DeviceContext^ context, Texture3D^ texture,
ImageFileFormat format, String^ fileName )
- {
- pin_ptr<const wchar_t> pinnedName = PtrToStringChars( fileName );
-
- HRESULT hr = D3DX11SaveTextureToFile( context->InternalPointer,
texture->InternalPointer, static_cast<D3DX11_IMAGE_FILE_FORMAT>( format ),
pinnedName );
- return RECORD_D3D11( hr );
- }
-
- Result Texture3D::ToStream( DeviceContext^ context, Texture3D^ texture,
ImageFileFormat format, Stream^ stream )
- {
- ID3D10Blob* blob = 0;
- HRESULT hr = D3DX11SaveTextureToMemory( context->InternalPointer,
texture->InternalPointer, static_cast<D3DX11_IMAGE_FILE_FORMAT>( format ),
&blob, 0 );
- if( RECORD_D3D11( hr ).IsFailure )
- return Result::Last;
-
- // Write byte-by-byte to avoid allocating a managed byte[] that will
wastefully persist.
- unsigned char* bytes = reinterpret_cast<unsigned char*>(
blob->GetBufferPointer() );
- for(SIZE_T byteIndex = 0; byteIndex < blob->GetBufferSize(); ++byteIndex)
- stream->WriteByte( bytes[byteIndex] );
-
- blob->Release();
- return Result::Last;
- }
}
}
=======================================
--- /branches/lite/source/direct3d11/Texture3D11.h Sat Jan 28 10:03:11 2012
+++ /branches/lite/source/direct3d11/Texture3D11.h Sat Mar 17 12:07:17 2012
@@ -23,7 +23,6 @@

#include "Enums11.h"
#include "Resource11.h"
-#include "ImageLoadInformation11.h"

namespace SlimDX
{
@@ -77,79 +76,6 @@
/// <param name="description">The description of the texture.</param>
/// <param name="data">An array of initial texture data for each
subresource.</param>
Texture3D( SlimDX::Direct3D11::Device^ device, Texture3DDescription
description, array<DataBox^>^ data );
-
- /// <summary>
- /// Loads a texture from an image file.
- /// </summary>
- /// <param name="device">The device used to load the texture.</param>
- /// <param name="fileName">Path to the file on disk.</param>
- /// <returns>The loaded texture object.</returns>
- static Texture3D^ FromFile( SlimDX::Direct3D11::Device^ device,
System::String^ fileName );
-
- /// <summary>
- /// Loads a texture from an image file.
- /// </summary>
- /// <param name="device">The device used to load the texture.</param>
- /// <param name="fileName">Path to the file on disk.</param>
- /// <param name="loadInfo">Specifies information used to load the
texture.</param>
- /// <returns>The loaded texture object.</returns>
- static Texture3D^ FromFile( SlimDX::Direct3D11::Device^ device,
System::String^ fileName, ImageLoadInformation loadInfo );
-
- /// <summary>
- /// Loads a texture from an image in memory.
- /// </summary>
- /// <param name="device">The device used to load the texture.</param>
- /// <param name="memory">Array of memory containing the image data to
load.</param>
- /// <returns>The loaded texture object.</returns>
- static Texture3D^ FromMemory( SlimDX::Direct3D11::Device^ device,
array<System::Byte>^ memory );
-
- /// <summary>
- /// Loads a texture from an image in memory.
- /// </summary>
- /// <param name="device">The device used to load the texture.</param>
- /// <param name="memory">Array of memory containing the image data to
load.</param>
- /// <param name="loadInfo">Specifies information used to load the
texture.</param>
- /// <returns>The loaded texture object.</returns>
- static Texture3D^ FromMemory( SlimDX::Direct3D11::Device^ device,
array<System::Byte>^ memory, ImageLoadInformation loadInfo );
-
- /// <summary>
- /// Loads a texture from a stream of data.
- /// </summary>
- /// <param name="device">The device used to load the texture.</param>
- /// <param name="stream">A stream containing the image data to
load.</param>
- /// <param name="sizeInBytes">Size of the image to load.</param>
- /// <returns>The loaded texture object.</returns>
- static Texture3D^ FromStream( SlimDX::Direct3D11::Device^ device,
System::IO::Stream^ stream, int sizeInBytes );
-
- /// <summary>
- /// Loads a texture from a stream of data.
- /// </summary>
- /// <param name="device">The device used to load the texture.</param>
- /// <param name="stream">A stream containing the image data to
load.</param>
- /// <param name="sizeInBytes">Size of the image to load.</param>
- /// <param name="loadInfo">Specifies information used to load the
texture.</param>
- /// <returns>The loaded texture object.</returns>
- static Texture3D^ FromStream( SlimDX::Direct3D11::Device^ device,
System::IO::Stream^ stream, int sizeInBytes, ImageLoadInformation loadInfo
);
-
- /// <summary>
- /// Saves a texture to file.
- /// </summary>
- /// <param name="context">The device used to save the texture.</param>
- /// <param name="texture">The texture to save.</param>
- /// <param name="format">The format the texture will be saved
as.</param>
- /// <param name="fileName">Name of the destination output file where
the texture will be saved.</param>
- /// <returns>A <see cref="SlimDX::Result"/> object describing the
result of the operation.</returns>
- static Result ToFile( DeviceContext^ context, Texture3D^ texture,
ImageFileFormat format, System::String^ fileName );
-
- /// <summary>
- /// Saves a texture to a stream.
- /// </summary>
- /// <param name="context">The device used to save the texture.</param>
- /// <param name="texture">The texture to save.</param>
- /// <param name="format">The format the texture will be saved
as.</param>
- /// <param name="stream">Destination memory stream where the image will
be saved.</param>
- /// <returns>A <see cref="SlimDX::Result"/> object describing the
result of the operation.</returns>
- static Result ToStream( DeviceContext^ context, Texture3D^ texture,
ImageFileFormat format, System::IO::Stream^ stream );
};
}
};
=======================================
--- /branches/lite/source/stdafx.h Sat Mar 17 11:15:48 2012
+++ /branches/lite/source/stdafx.h Sat Mar 17 12:07:17 2012
@@ -32,8 +32,6 @@
#include <dxgi.h>
#include <d3d11.h>
#include <d3d11shader.h>
-#include <d3dx11.h>
-#include <d3dcsx.h>
#include <dwrite.h>
#include <xinput.h>
#include <xaudio2.h>