Commit 331bb68e authored by Stefan Dösinger's avatar Stefan Dösinger Committed by Alexandre Julliard

wined3d: Remove SCRATCH and SYSMEM lockability warnings.

They are not needed any more, resource_access_from_pool takes care of this.
parent 672e3ee1
...@@ -6795,20 +6795,6 @@ static HRESULT surface_init(struct wined3d_surface *surface, UINT alignment, UIN ...@@ -6795,20 +6795,6 @@ static HRESULT surface_init(struct wined3d_surface *surface, UINT alignment, UIN
* Levels need to be checked too, since they all affect what can be done. */ * Levels need to be checked too, since they all affect what can be done. */
switch (pool) switch (pool)
{ {
case WINED3D_POOL_SCRATCH:
if (!lockable)
{
FIXME("Called with a pool of SCRATCH and a lockable of FALSE "
"which are mutually exclusive, setting lockable to TRUE.\n");
lockable = TRUE;
}
break;
case WINED3D_POOL_SYSTEM_MEM:
if (!lockable)
FIXME("Called with a pool of SYSTEMMEM and a lockable of FALSE, this is acceptable but unexpected.\n");
break;
case WINED3D_POOL_MANAGED: case WINED3D_POOL_MANAGED:
if (usage & WINED3DUSAGE_DYNAMIC) if (usage & WINED3DUSAGE_DYNAMIC)
FIXME("Called with a pool of MANAGED and a usage of DYNAMIC which are mutually exclusive.\n"); FIXME("Called with a pool of MANAGED and a usage of DYNAMIC which are mutually exclusive.\n");
...@@ -6819,6 +6805,10 @@ static HRESULT surface_init(struct wined3d_surface *surface, UINT alignment, UIN ...@@ -6819,6 +6805,10 @@ static HRESULT surface_init(struct wined3d_surface *surface, UINT alignment, UIN
WARN("Creating a lockable surface with a POOL of DEFAULT, that doesn't specify DYNAMIC usage.\n"); WARN("Creating a lockable surface with a POOL of DEFAULT, that doesn't specify DYNAMIC usage.\n");
break; break;
case WINED3D_POOL_SCRATCH:
case WINED3D_POOL_SYSTEM_MEM:
break;
default: default:
FIXME("Unknown pool %#x.\n", pool); FIXME("Unknown pool %#x.\n", pool);
break; break;
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment