Displaying 20 results from an estimated 25 matches for "ms_x".
2014 Mar 06
0
[PATCH] nv50, nvc0: adjust blit_3d handling of ms output textures
...,11 +997,14 @@ nv50_blit_3d(struct nv50_context *nv50, const struct pipe_blit_info *info)
x_range = (float)info->src.box.width / (float)info->dst.box.width;
y_range = (float)info->src.box.height / (float)info->dst.box.height;
+ x_output = 16384 << nv50_miptree(dst)->ms_x;
+ y_output = 16384 << nv50_miptree(dst)->ms_y;
+
x0 = (float)info->src.box.x - x_range * (float)info->dst.box.x;
y0 = (float)info->src.box.y - y_range * (float)info->dst.box.y;
- x1 = x0 + 16384.0f * x_range;
- y1 = y0 + 16384.0f * y_range;
+ x1 = x0 + x_outp...
2014 May 10
2
[PATCH] nv50: fix setting of texture ms info to be per-stage
...mp = new_LValue(func, FILE_GPR);
uint8_t b = prog->driver->io.resInfoCBSlot;
off += prog->driver->io.suInfoBase;
+ if (prog->getType() > Program::TYPE_VERTEX)
+ off += 16 * 2 * 4;
+ if (prog->getType() > Program::TYPE_GEOMETRY)
+ off += 16 * 2 * 4;
*ms_x = bld.mkLoadv(TYPE_U32, bld.mkSymbol(
FILE_MEMORY_CONST, b, TYPE_U32, off + 0), NULL);
*ms_y = bld.mkLoadv(TYPE_U32, bld.mkSymbol(
diff --git a/src/gallium/drivers/nouveau/nv50/nv50_context.h b/src/gallium/drivers/nouveau/nv50/nv50_context.h
index b776dee..3b7cb18...
2015 Sep 07
2
[PATCH mesa 2/3] nv30: Fix color resolving for nv3x cards
...> + w = 512;
> +
> + src.offset = y * src.pitch + x * src.cpp;
> + src.x0 = 0;
> + src.x1 = w;
> + src.w = w;
> +
> + dst.offset = (y >> src_mt->ms_y) * dst.pitch +
> + (x >> src_mt->ms_x) * dst.cpp;
> + dst.x1 = dst.x0 + (w >> src_mt->ms_x);
> + dst.w = w >> src_mt->ms_x;
> +
> + nv30_transfer_rect(nv30, BILINEAR, &src, &dst);
> + }
> + }
> +}
> +
> +static void
> +nv40_resource_resolve(struct nv...
2015 Sep 09
3
[PATCH mesa v2 1/2] nv30: Fix color resolving for nv3x cards
...w = x1 - x;
+ if (w > 1024)
+ w = 1024;
+
+ src.offset = y * src.pitch + x * src.cpp;
+ src.x0 = 0;
+ src.x1 = w;
+ src.w = w;
+
+ dst.offset = (y >> src_mt->ms_y) * dst.pitch +
+ (x >> src_mt->ms_x) * dst.cpp;
+ dst.x1 = dst.x0 + (w >> src_mt->ms_x);
+ dst.w = w >> src_mt->ms_x;
+
+ nv30_transfer_rect(nv30, BILINEAR, &src, &dst);
+ }
+ }
}
void
--
2.4.3
2014 Apr 18
0
[PATCH] nv50: use 2d blit when src/dst have same number of samples
...veau/nv50/nv50_surface.c
@@ -1299,8 +1299,8 @@ nv50_blit_eng2d(struct nv50_context *nv50, const struct pipe_blit_info *info)
if (src->base.base.nr_samples > dst->base.base.nr_samples) {
/* center src coorinates for proper MS resolve filtering */
- srcx += (int64_t)src->ms_x << 32;
- srcy += (int64_t)src->ms_y << 32;
+ srcx += (int64_t)1 << (src->ms_x + 31);
+ srcy += (int64_t)1 << (src->ms_y + 31);
}
dstx = info->dst.box.x << dst->ms_x;
@@ -1438,8 +1438,8 @@ nv50_blit(struct pipe_context *pipe, cons...
2015 Aug 28
2
nv3x libreoffice impress opengl animations not working
On Fri, Aug 28, 2015 at 4:54 AM, Hans de Goede <hdegoede at redhat.com> wrote:
> Hi,
>
> On 27-08-15 20:19, Ilia Mirkin wrote:
>>
>> On Thu, Aug 27, 2015 at 1:59 PM, Alex Deucher <alexdeucher at gmail.com>
>> wrote:
>
>
> <snip>
>
>>>>>> 2) Since the glretrace does work outside of libreoffice impress, I
2015 Sep 07
5
[PATCH mesa 1/3] nv30: Fix max width / height checks in nv30 sifm code
The sifm object has a limit of 1024x1024 for its input size and 2048x2048
for its output. The code checking this was trying to be clever resulting
in it seeing a surface of e.g 1024x256 being outside of the input size
limit.
This commit fixes this.
Signed-off-by: Hans de Goede <hdegoede at redhat.com>
---
src/gallium/drivers/nouveau/nv30/nv30_transfer.c | 4 ++--
1 file changed, 2
2015 Sep 02
2
nv3x libreoffice impress opengl animations not working
...ring if I cannot
> just simple call nv30_transfer_rect with the right parameters and
> let it sort the blit out ?
That seems fine to me. BTW, it's sifm == scaled image from memory, not
sfim. You'll either have to fudge the width/height, or teach the
transfer methods to look at mt->ms_x/y (and make sure to treat it as a
scaled xfer if the nr_samples don't line up).
-ilia
2015 Jan 02
2
[PATCH v2] nv50: enable texture compression
...m/drivers/nouveau/nv50/nv50_miptree.c
+++ b/src/gallium/drivers/nouveau/nv50/nv50_miptree.c
@@ -65,8 +65,7 @@ nv50_tex_choose_tile_dims(unsigned nx, unsigned ny, unsigned nz)
static uint32_t
nv50_mt_choose_storage_type(struct nv50_miptree *mt, boolean compressed)
{
- const unsigned ms = mt->ms_x + mt->ms_y;
-
+ const unsigned ms = util_logbase2(mt->base.base.nr_samples);
uint32_t tile_flags;
if (unlikely(mt->base.base.flags & NOUVEAU_RESOURCE_FLAG_LINEAR))
@@ -96,6 +95,26 @@ nv50_mt_choose_storage_type(struct nv50_miptree *mt, boolean compressed)
tile_flags...
2015 Aug 31
2
nv3x libreoffice impress opengl animations not working
...g further I now know where the multiply
> by 2 comes from, the pipe_resource *tmpl passed into nv30_miptree_create
> has templ->nr_samples = 4, and nv30_miptree_create has:
>
> switch (tmpl->nr_samples) {
> case 4:
> mt->ms_mode = 0x00004000;
> mt->ms_x = 1;
> mt->ms_y = 1;
> break;
> case 2:
> mt->ms_mode = 0x00003000;
> mt->ms_x = 1;
> mt->ms_y = 0;
> break;
> default:
> mt->ms_mode = 0x00000000;
> mt->ms_x = 0;
> mt->ms_y = 0;
>...
2015 Jan 02
2
[PATCH] nv50: enable texture compression
...m/drivers/nouveau/nv50/nv50_miptree.c
+++ b/src/gallium/drivers/nouveau/nv50/nv50_miptree.c
@@ -65,8 +65,7 @@ nv50_tex_choose_tile_dims(unsigned nx, unsigned ny, unsigned nz)
static uint32_t
nv50_mt_choose_storage_type(struct nv50_miptree *mt, boolean compressed)
{
- const unsigned ms = mt->ms_x + mt->ms_y;
-
+ const unsigned ms = util_logbase2(mt->base.base.nr_samples);
uint32_t tile_flags;
if (unlikely(mt->base.base.flags & NOUVEAU_RESOURCE_FLAG_LINEAR))
@@ -96,6 +95,7 @@ nv50_mt_choose_storage_type(struct nv50_miptree *mt, boolean compressed)
tile_flags =...
2014 Mar 06
0
[RFC PATCH] nv50: adjust blit_3d logic
...s/nouveau/nv50/nv50_surface.c
@@ -1069,7 +1069,7 @@ nv50_blit_3d(struct nv50_context *nv50, const struct pipe_blit_info *info)
PUSH_DATAf(push, y0);
PUSH_DATAf(push, z);
BEGIN_NV04(push, NV50_3D(VTX_ATTR_2F_X(0)), 2);
- PUSH_DATAf(push, 16384 << nv50_miptree(dst)->ms_x);
+ PUSH_DATAf(push, 16384/* << nv50_miptree(dst)->ms_x*/);
PUSH_DATAf(push, 0.0f);
BEGIN_NV04(push, NV50_3D(VTX_ATTR_3F_X(1)), 3);
PUSH_DATAf(push, x0);
@@ -1077,7 +1077,7 @@ nv50_blit_3d(struct nv50_context *nv50, const struct pipe_blit_info *info)
PUSH_D...
2015 Jan 02
1
[PATCH v2] nv50: enable texture compression
...static uint32_t
>> nv50_mt_choose_storage_type(struct nv50_miptree *mt, boolean compressed)
> The caller of this currently always says true. However it should
> probably be drm_version >= whatever.
Oh sure, i'll add it!
>
>> {
>> - const unsigned ms = mt->ms_x + mt->ms_y;
>> -
>> + const unsigned ms = util_logbase2(mt->base.base.nr_samples);
>> uint32_t tile_flags;
>>
>> if (unlikely(mt->base.base.flags & NOUVEAU_RESOURCE_FLAG_LINEAR))
>> @@ -96,6 +95,26 @@ nv50_mt_choose_storage_type(struct nv...
2016 Feb 15
2
[PATCH 23/23] nvc0: implement support for maxwell texture headers
...MSAA8) ?
> + GM107_TIC2_3_USE_HEADER_OPT_CONTROL :
> + GM107_TIC2_3_LOD_ANISO_QUALITY_HIGH |
> + GM107_TIC2_3_LOD_ISO_QUALITY_HIGH;
> +
> + if (flags & NV50_TEXVIEW_ACCESS_RESOLVE) {
> + width = mt->base.base.width0 << mt->ms_x;
> + height = mt->base.base.height0 << mt->ms_y;
> + } else {
> + width = mt->base.base.width0;
> + height = mt->base.base.height0;
> + }
> +
> + tic[4] |= width - 1;
> +
> + tic[5] |= (height - 1) & 0xffff;
> + tic[5] |=...
2016 Feb 15
0
[PATCH 23/23] nvc0: implement support for maxwell texture headers
...ags & NV50_TEXVIEW_FILTER_MSAA8) ?
+ GM107_TIC2_3_USE_HEADER_OPT_CONTROL :
+ GM107_TIC2_3_LOD_ANISO_QUALITY_HIGH |
+ GM107_TIC2_3_LOD_ISO_QUALITY_HIGH;
+
+ if (flags & NV50_TEXVIEW_ACCESS_RESOLVE) {
+ width = mt->base.base.width0 << mt->ms_x;
+ height = mt->base.base.height0 << mt->ms_y;
+ } else {
+ width = mt->base.base.width0;
+ height = mt->base.base.height0;
+ }
+
+ tic[4] |= width - 1;
+
+ tic[5] |= (height - 1) & 0xffff;
+ tic[5] |= (depth - 1) << GM107_TIC2_5_DEPTH_MINUS_ONE_...
2014 Jan 13
20
[PATCH 00/19] nv50: add sampler2DMS/GP support to get OpenGL 3.2
OK, so there's a bunch of stuff in here. The geometry stuff is based on the
work started by Bryan Cain and Christoph Bumiller.
Patches 01-12: Add support for geometry shaders and fix related issues
Patches 13-14: Make it possible for fb clears to operate on texture attachments
with an explicit layer set (as is allowed in gl 3.2).
Patches 15-17: Make ARB_texture_multisample work
2016 Feb 15
0
[PATCH 23/23] nvc0: implement support for maxwell texture headers
...GM107_TIC2_3_USE_HEADER_OPT_CONTROL :
>> + GM107_TIC2_3_LOD_ANISO_QUALITY_HIGH |
>> + GM107_TIC2_3_LOD_ISO_QUALITY_HIGH;
>> +
>> + if (flags & NV50_TEXVIEW_ACCESS_RESOLVE) {
>> + width = mt->base.base.width0 << mt->ms_x;
>> + height = mt->base.base.height0 << mt->ms_y;
>> + } else {
>> + width = mt->base.base.width0;
>> + height = mt->base.base.height0;
>> + }
>> +
>> + tic[4] |= width - 1;
>> +
>> + tic[5] |= (height -...
2015 Sep 03
2
[PATCH mesa 3/4] nv30: Do not export msaa capabable visuals on nv3x
On Thu, Sep 3, 2015 at 7:25 AM, Hans de Goede <hdegoede at redhat.com> wrote:
> On nv3x we will likely end up using the cpu to do color resolving for msaa
> blits. Disable msaa on these cards so that we do not end up using the cpu.
Actually the CPU fallback won't do scaled, so it's stuck with SIFM or
assert(false). Which isn't great, but... it's what the HW does. I
2015 Jan 02
0
[PATCH] nv50: enable texture compression
...ptree.c
> +++ b/src/gallium/drivers/nouveau/nv50/nv50_miptree.c
> @@ -65,8 +65,7 @@ nv50_tex_choose_tile_dims(unsigned nx, unsigned ny, unsigned nz)
> static uint32_t
> nv50_mt_choose_storage_type(struct nv50_miptree *mt, boolean compressed)
> {
> - const unsigned ms = mt->ms_x + mt->ms_y;
> -
> + const unsigned ms = util_logbase2(mt->base.base.nr_samples);
> uint32_t tile_flags;
>
> if (unlikely(mt->base.base.flags & NOUVEAU_RESOURCE_FLAG_LINEAR))
> @@ -96,6 +95,7 @@ nv50_mt_choose_storage_type(struct nv50_miptree *mt, boolean com...
2015 Jan 02
0
[PATCH v2] nv50: enable texture compression
...ile_dims(unsigned nx, unsigned ny, unsigned nz)
> static uint32_t
> nv50_mt_choose_storage_type(struct nv50_miptree *mt, boolean compressed)
The caller of this currently always says true. However it should
probably be drm_version >= whatever.
> {
> - const unsigned ms = mt->ms_x + mt->ms_y;
> -
> + const unsigned ms = util_logbase2(mt->base.base.nr_samples);
> uint32_t tile_flags;
>
> if (unlikely(mt->base.base.flags & NOUVEAU_RESOURCE_FLAG_LINEAR))
> @@ -96,6 +95,26 @@ nv50_mt_choose_storage_type(struct nv50_miptree *mt, boolean co...