diff options
author | Ilia Mirkin <[email protected]> | 2014-08-20 20:19:38 -0400 |
---|---|---|
committer | Ilia Mirkin <[email protected]> | 2014-09-12 00:57:45 -0400 |
commit | 95058bdec31d3faa76be01731a26939f3039a66b (patch) | |
tree | a209c3a2a20cd43158d7fc9729cc1b5d39ea99ef /src/gallium/drivers/nouveau/nvc0 | |
parent | d82bd7eb060cf2fbb7282da38f28f6e7ea705e12 (diff) |
nv50,nvc0: enable ARB_texture_view
Signed-off-by: Ilia Mirkin <[email protected]>
Diffstat (limited to 'src/gallium/drivers/nouveau/nvc0')
-rw-r--r-- | src/gallium/drivers/nouveau/nvc0/nvc0_screen.c | 2 | ||||
-rw-r--r-- | src/gallium/drivers/nouveau/nvc0/nvc0_tex.c | 4 |
2 files changed, 3 insertions, 3 deletions
diff --git a/src/gallium/drivers/nouveau/nvc0/nvc0_screen.c b/src/gallium/drivers/nouveau/nvc0/nvc0_screen.c index 4e7b8d6c82e..3858981348c 100644 --- a/src/gallium/drivers/nouveau/nvc0/nvc0_screen.c +++ b/src/gallium/drivers/nouveau/nvc0/nvc0_screen.c @@ -170,6 +170,7 @@ nvc0_screen_get_param(struct pipe_screen *pscreen, enum pipe_cap param) case PIPE_CAP_TEXTURE_GATHER_SM5: case PIPE_CAP_TGSI_FS_FINE_DERIVATIVE: case PIPE_CAP_CONDITIONAL_RENDER_INVERTED: + case PIPE_CAP_SAMPLER_VIEW_TARGET: return 1; case PIPE_CAP_SEAMLESS_CUBE_MAP_PER_TEXTURE: return (class_3d >= NVE4_3D_CLASS) ? 1 : 0; @@ -187,7 +188,6 @@ nvc0_screen_get_param(struct pipe_screen *pscreen, enum pipe_cap param) case PIPE_CAP_TGSI_VS_LAYER_VIEWPORT: case PIPE_CAP_FAKE_SW_MSAA: case PIPE_CAP_TGSI_VS_WINDOW_SPACE_POSITION: - case PIPE_CAP_SAMPLER_VIEW_TARGET: return 0; case PIPE_CAP_VENDOR_ID: diff --git a/src/gallium/drivers/nouveau/nvc0/nvc0_tex.c b/src/gallium/drivers/nouveau/nvc0/nvc0_tex.c index 1b11bd0ba88..db6b6036a72 100644 --- a/src/gallium/drivers/nouveau/nvc0/nvc0_tex.c +++ b/src/gallium/drivers/nouveau/nvc0/nvc0_tex.c @@ -61,10 +61,10 @@ nvc0_create_sampler_view(struct pipe_context *pipe, { uint32_t flags = 0; - if (res->target == PIPE_TEXTURE_RECT || res->target == PIPE_BUFFER) + if (templ->target == PIPE_TEXTURE_RECT || templ->target == PIPE_BUFFER) flags |= NV50_TEXVIEW_SCALED_COORDS; - return nvc0_create_texture_view(pipe, res, templ, flags, res->target); + return nvc0_create_texture_view(pipe, res, templ, flags, templ->target); } struct pipe_sampler_view * |