From 95058bdec31d3faa76be01731a26939f3039a66b Mon Sep 17 00:00:00 2001 From: Ilia Mirkin Date: Wed, 20 Aug 2014 20:19:38 -0400 Subject: [PATCH] nv50,nvc0: enable ARB_texture_view Signed-off-by: Ilia Mirkin --- docs/GL3.txt | 2 +- docs/relnotes/10.4.html | 62 +++++++++++++++++++ .../drivers/nouveau/nv50/nv50_screen.c | 2 +- src/gallium/drivers/nouveau/nv50/nv50_tex.c | 4 +- .../drivers/nouveau/nvc0/nvc0_screen.c | 2 +- src/gallium/drivers/nouveau/nvc0/nvc0_tex.c | 4 +- 6 files changed, 69 insertions(+), 7 deletions(-) create mode 100644 docs/relnotes/10.4.html diff --git a/docs/GL3.txt b/docs/GL3.txt index f02ad67f3f5..5adc7598c0c 100644 --- a/docs/GL3.txt +++ b/docs/GL3.txt @@ -168,7 +168,7 @@ GL 4.3, GLSL 4.30: GL_ARB_texture_buffer_range DONE (nv50, nvc0, i965, r600, radeonsi, llvmpipe) GL_ARB_texture_query_levels DONE (all drivers that support GLSL 1.30) GL_ARB_texture_storage_multisample DONE (all drivers that support GL_ARB_texture_multisample) - GL_ARB_texture_view DONE (i965) + GL_ARB_texture_view DONE (i965, nv50, nvc0) GL_ARB_vertex_attrib_binding DONE (all drivers) diff --git a/docs/relnotes/10.4.html b/docs/relnotes/10.4.html new file mode 100644 index 00000000000..e6813d3d100 --- /dev/null +++ b/docs/relnotes/10.4.html @@ -0,0 +1,62 @@ + + + + + Mesa Release Notes + + + + +
+

The Mesa 3D Graphics Library

+
+ + +
+ +

Mesa 10.4 Release Notes / TBD

+ +

+Mesa 10.4 is a new development release. +People who are concerned with stability and reliability should stick +with a previous release or wait for Mesa 10.4.1. +

+

+Mesa 10.4 implements the OpenGL 3.3 API, but the version reported by +glGetString(GL_VERSION) or glGetIntegerv(GL_MAJOR_VERSION) / +glGetIntegerv(GL_MINOR_VERSION) depends on the particular driver being used. +Some drivers don't support all the features required in OpenGL 3.3. OpenGL +3.3 is only available if requested at context creation +because compatibility contexts are not supported. +

+ + +

MD5 checksums

+
+TBD.
+
+ + +

New features

+ +

+Note: some of the new features are only available with certain drivers. +

+ +
    +
  • GL_ARB_texture_view on nv50, nvc0
    • +
+ + +

Bug fixes

+ +TBD. + +

Changes

+ +
    +
+ +
+ + diff --git a/src/gallium/drivers/nouveau/nv50/nv50_screen.c b/src/gallium/drivers/nouveau/nv50/nv50_screen.c index b2a30195251..3a46e72a0f7 100644 --- a/src/gallium/drivers/nouveau/nv50/nv50_screen.c +++ b/src/gallium/drivers/nouveau/nv50/nv50_screen.c @@ -171,6 +171,7 @@ nv50_screen_get_param(struct pipe_screen *pscreen, enum pipe_cap param) case PIPE_CAP_TEXTURE_MULTISAMPLE: case PIPE_CAP_PREFER_BLIT_BASED_TEXTURE_TRANSFER: case PIPE_CAP_TGSI_FS_FINE_DERIVATIVE: + case PIPE_CAP_SAMPLER_VIEW_TARGET: return 1; case PIPE_CAP_SEAMLESS_CUBE_MAP: return 1; /* class_3d >= NVA0_3D_CLASS; */ @@ -203,7 +204,6 @@ nv50_screen_get_param(struct pipe_screen *pscreen, enum pipe_cap param) case PIPE_CAP_COMPUTE: case PIPE_CAP_DRAW_INDIRECT: case PIPE_CAP_CONDITIONAL_RENDER_INVERTED: - case PIPE_CAP_SAMPLER_VIEW_TARGET: return 0; case PIPE_CAP_VENDOR_ID: diff --git a/src/gallium/drivers/nouveau/nv50/nv50_tex.c b/src/gallium/drivers/nouveau/nv50/nv50_tex.c index 0d2604e3921..d69c8d6ff0d 100644 --- a/src/gallium/drivers/nouveau/nv50/nv50_tex.c +++ b/src/gallium/drivers/nouveau/nv50/nv50_tex.c @@ -58,10 +58,10 @@ nv50_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 nv50_create_texture_view(pipe, res, templ, flags, res->target); + return nv50_create_texture_view(pipe, res, templ, flags, templ->target); } struct pipe_sampler_view * 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 * -- 2.30.2