Skip to content
Projects
Groups
Snippets
Help
This project
Loading...
Sign in / Register
Toggle navigation
W
wine-cw
Project
Project
Details
Activity
Cycle Analytics
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Issues
0
Issues
0
List
Board
Labels
Milestones
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Charts
Registry
Registry
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Charts
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
wine
wine-cw
Commits
0d6d64b3
Commit
0d6d64b3
authored
Apr 26, 2015
by
Stefan Dösinger
Committed by
Alexandre Julliard
Apr 27, 2015
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
wined3d: Move the ARB_texture_cube_map check to init_format_texture_info.
parent
7109bebd
Hide whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
2 additions
and
13 deletions
+2
-13
directx.c
dlls/wined3d/directx.c
+0
-6
texture.c
dlls/wined3d/texture.c
+0
-6
utils.c
dlls/wined3d/utils.c
+2
-1
No files found.
dlls/wined3d/directx.c
View file @
0d6d64b3
...
...
@@ -4430,12 +4430,6 @@ HRESULT CDECL wined3d_check_device_format(const struct wined3d *wined3d, UINT ad
switch
(
resource_type
)
{
case
WINED3D_RTYPE_CUBE_TEXTURE
:
if
(
!
gl_info
->
supported
[
ARB_TEXTURE_CUBE_MAP
])
{
TRACE
(
"[FAILED] - No cube texture support.
\n
"
);
return
WINED3DERR_NOTAVAILABLE
;
}
format_flags
|=
WINED3DFMT_FLAG_TEXTURE
;
allowed_usage
=
WINED3DUSAGE_AUTOGENMIPMAP
|
WINED3DUSAGE_DYNAMIC
...
...
dlls/wined3d/texture.c
View file @
0d6d64b3
...
...
@@ -979,12 +979,6 @@ static HRESULT cubetexture_init(struct wined3d_texture *texture, const struct wi
return
WINED3DERR_INVALIDCALL
;
}
if
(
!
gl_info
->
supported
[
ARB_TEXTURE_CUBE_MAP
]
&&
desc
->
pool
!=
WINED3D_POOL_SCRATCH
)
{
WARN
(
"(%p) : Tried to create not supported cube texture.
\n
"
,
texture
);
return
WINED3DERR_INVALIDCALL
;
}
/* Calculate levels for mip mapping */
if
(
desc
->
usage
&
WINED3DUSAGE_AUTOGENMIPMAP
)
{
...
...
dlls/wined3d/utils.c
View file @
0d6d64b3
...
...
@@ -1859,7 +1859,8 @@ static BOOL init_format_texture_info(struct wined3d_adapter *adapter, struct win
format
->
flags
[
WINED3D_GL_RES_TYPE_TEX_2D
]
|=
format_texture_info
[
i
].
flags
;
if
(
gl_info
->
supported
[
EXT_TEXTURE3D
])
format
->
flags
[
WINED3D_GL_RES_TYPE_TEX_3D
]
|=
format_texture_info
[
i
].
flags
;
format
->
flags
[
WINED3D_GL_RES_TYPE_TEX_CUBE
]
|=
format_texture_info
[
i
].
flags
;
if
(
gl_info
->
supported
[
ARB_TEXTURE_CUBE_MAP
])
format
->
flags
[
WINED3D_GL_RES_TYPE_TEX_CUBE
]
|=
format_texture_info
[
i
].
flags
;
format
->
flags
[
WINED3D_GL_RES_TYPE_TEX_RECT
]
|=
format_texture_info
[
i
].
flags
;
format
->
flags
[
WINED3D_GL_RES_TYPE_BUFFER
]
|=
format_texture_info
[
i
].
flags
;
...
...
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