Skip to content
GitLab
Menu
Projects
Groups
Snippets
Loading...
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in
Toggle navigation
Menu
Open sidebar
PoroCYon
Bonzomatic
Commits
525e78a8
Commit
525e78a8
authored
Mar 29, 2018
by
Gargaj
Browse files
fix 1d texture in dx11 renderer
reenable debug device fix d3d11 warnings
parent
d4956f0a
Changes
1
Hide whitespace changes
Inline
Side-by-side
src/platform_w32_dx11/Renderer.cpp
View file @
525e78a8
...
...
@@ -418,7 +418,7 @@ namespace Renderer
DWORD
deviceCreationFlags
=
0
;
#ifdef _DEBUG
//
deviceCreationFlags |= D3D11_CREATE_DEVICE_DEBUG;
deviceCreationFlags
|=
D3D11_CREATE_DEVICE_DEBUG
;
#endif
if
(
D3D11CreateDeviceAndSwapChain
(
...
...
@@ -540,7 +540,7 @@ namespace Renderer
sampDesc
.
AddressU
=
D3D11_TEXTURE_ADDRESS_WRAP
;
sampDesc
.
AddressV
=
D3D11_TEXTURE_ADDRESS_WRAP
;
sampDesc
.
AddressW
=
D3D11_TEXTURE_ADDRESS_WRAP
;
sampDesc
.
Filter
=
D3D11_FILTER_
COMPARISON_
MIN_MAG_LINEAR_MIP_POINT
;
sampDesc
.
Filter
=
D3D11_FILTER_MIN_MAG_LINEAR_MIP_POINT
;
if
(
pDevice
->
CreateSamplerState
(
&
sampDesc
,
&
pFullscreenQuadSamplerState
)
!=
S_OK
)
return
false
;
...
...
@@ -1054,6 +1054,10 @@ namespace Renderer
pContext
->
OMSetBlendState
(
pGUIBlendState
,
factor
,
0xFFFFFFFF
);
pContext
->
RSSetState
(
pGUIRasterizerState
);
// Disable previous texture
ID3D11ShaderResourceView
*
dummy
[
1
]
=
{
NULL
};
pContext
->
PSSetShaderResources
(
0
,
1
,
dummy
);
ID3D11Buffer
*
buffers
[]
=
{
pGUIQuadVB
};
UINT
stride
[]
=
{
sizeof
(
float
)
*
7
};
UINT
offset
[]
=
{
0
};
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
.
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment