ReceiveTempSMS
/
Sweden-Number
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

wined3d: Implement texture cube array views. 

Signed-off-by: Józef Kucia <jkucia@codeweavers.com>
Signed-off-by: Henri Verbeet <hverbeet@codeweavers.com>
Signed-off-by: Alexandre Julliard <julliard@winehq.org>
This commit is contained in:
Józef Kucia 2017-02-10 12:26:54 +01:00 committed by Alexandre Julliard
parent 73979e7112
commit d4e439a36a
2 changed files with 17 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
dlls/wined3d/context.c
View File

@ -2453,6 +2453,10 @@ void context_bind_texture(struct wined3d_context *context, GLenum target, GLuint
gl_info->gl_ops.gl.p_glBindTexture(GL_TEXTURE_CUBE_MAP, device->dummy_textures.tex_cube); gl_info->gl_ops.gl.p_glBindTexture(GL_TEXTURE_CUBE_MAP, device->dummy_textures.tex_cube);
checkGLcall("glBindTexture"); checkGLcall("glBindTexture");
break; break;
case GL_TEXTURE_CUBE_MAP_ARRAY:
gl_info->gl_ops.gl.p_glBindTexture(GL_TEXTURE_CUBE_MAP_ARRAY, 0);
checkGLcall("glBindTexture");
break;
case GL_TEXTURE_3D: case GL_TEXTURE_3D:
gl_info->gl_ops.gl.p_glBindTexture(GL_TEXTURE_3D, device->dummy_textures.tex_3d); gl_info->gl_ops.gl.p_glBindTexture(GL_TEXTURE_3D, device->dummy_textures.tex_3d);
checkGLcall("glBindTexture"); checkGLcall("glBindTexture");

18
dlls/wined3d/view.c
View File

@ -24,20 +24,23 @@
WINE_DEFAULT_DEBUG_CHANNEL(d3d); WINE_DEFAULT_DEBUG_CHANNEL(d3d);
#define WINED3D_VIEW_CUBE_ARRAY (WINED3D_VIEW_TEXTURE_CUBE | WINED3D_VIEW_TEXTURE_ARRAY)
static BOOL is_stencil_view_format(const struct wined3d_format *format) static BOOL is_stencil_view_format(const struct wined3d_format *format)
{ {
return format->id == WINED3DFMT_X24_TYPELESS_G8_UINT return format->id == WINED3DFMT_X24_TYPELESS_G8_UINT
|| format->id == WINED3DFMT_X32_TYPELESS_G8X24_UINT; || format->id == WINED3DFMT_X32_TYPELESS_G8X24_UINT;
} }
static GLenum get_texture_view_target(const struct wined3d_view_desc *desc, static GLenum get_texture_view_target(const struct wined3d_gl_info *gl_info,
const struct wined3d_texture *texture) const struct wined3d_view_desc *desc, const struct wined3d_texture *texture)
{ {
static const struct static const struct
{ {
GLenum texture_target; GLenum texture_target;
unsigned int view_flags; unsigned int view_flags;
GLenum view_target; GLenum view_target;
enum wined3d_gl_extension extension;
} }
view_types[] = view_types[] =
{ {
@ -46,14 +49,19 @@ static GLenum get_texture_view_target(const struct wined3d_view_desc *desc,
{GL_TEXTURE_2D_ARRAY, 0, GL_TEXTURE_2D}, {GL_TEXTURE_2D_ARRAY, 0, GL_TEXTURE_2D},
{GL_TEXTURE_2D_ARRAY, WINED3D_VIEW_TEXTURE_ARRAY, GL_TEXTURE_2D_ARRAY}, {GL_TEXTURE_2D_ARRAY, WINED3D_VIEW_TEXTURE_ARRAY, GL_TEXTURE_2D_ARRAY},
{GL_TEXTURE_2D_ARRAY, WINED3D_VIEW_TEXTURE_CUBE, GL_TEXTURE_CUBE_MAP}, {GL_TEXTURE_2D_ARRAY, WINED3D_VIEW_TEXTURE_CUBE, GL_TEXTURE_CUBE_MAP},
{GL_TEXTURE_2D_ARRAY, WINED3D_VIEW_CUBE_ARRAY, GL_TEXTURE_CUBE_MAP_ARRAY, ARB_TEXTURE_CUBE_MAP_ARRAY},
{GL_TEXTURE_3D, 0, GL_TEXTURE_3D}, {GL_TEXTURE_3D, 0, GL_TEXTURE_3D},
}; };
unsigned int i; unsigned int i;
for (i = 0; i < ARRAY_SIZE(view_types); ++i) for (i = 0; i < ARRAY_SIZE(view_types); ++i)
{ {
if (view_types[i].texture_target == texture->target && view_types[i].view_flags == desc->flags) if (view_types[i].texture_target != texture->target || view_types[i].view_flags != desc->flags)
continue;
if (gl_info->supported[view_types[i].extension])
return view_types[i].view_target; return view_types[i].view_target;
FIXME("Extension %#x not supported.\n", view_types[i].extension);
} }
FIXME("Unhandled view flags %#x for texture target %#x.\n", desc->flags, texture->target); FIXME("Unhandled view flags %#x for texture target %#x.\n", desc->flags, texture->target);
@ -478,7 +486,7 @@ static HRESULT wined3d_shader_resource_view_init(struct wined3d_shader_resource_
|| desc->u.texture.layer_count > texture->layer_count - desc->u.texture.layer_idx) || desc->u.texture.layer_count > texture->layer_count - desc->u.texture.layer_idx)
return E_INVALIDARG; return E_INVALIDARG;
view_target = get_texture_view_target(desc, texture); view_target = get_texture_view_target(gl_info, desc, texture);
if (resource->format->id == view_format->id && texture->target == view_target if (resource->format->id == view_format->id && texture->target == view_target
&& !desc->u.texture.level_idx && desc->u.texture.level_count == texture->level_count && !desc->u.texture.level_idx && desc->u.texture.level_count == texture->level_count
@ -659,7 +667,7 @@ static HRESULT wined3d_unordered_access_view_init(struct wined3d_unordered_acces
if (desc->u.texture.layer_idx || desc->u.texture.layer_count != depth_or_layer_count) if (desc->u.texture.layer_idx || desc->u.texture.layer_count != depth_or_layer_count)
{ {
create_texture_view(&view->gl_view, get_texture_view_target(desc, texture), create_texture_view(&view->gl_view, get_texture_view_target(gl_info, desc, texture),
desc, texture, view->format); desc, texture, view->format);
} }