Yes, with attached glean/readPixSanity test is passing now. The only regressed
test now is texturing/texdepth but I believe that something else must have
broken it.
Regards,
Maciej
Dnia wtorek, 17 listopada 2009 o 19:04:47 Brian Paul napisał(a):
> Do Michel's recents commits help with these?
>
> -Brian
>
> Maciej Cencora wrote:
> > There's certainly a progress. Now only glean/readPixSanity and
> > texturing/texDepth tests are failing. I've checked glean/readPixSanity
> > and it's failing for 24bit depth buffer (no stencil buffer) visuals. I've
> > tried modifying radeon_span.c code but without a luck.
> > I'm attaching the patch I've used.
> >
> > Regards,
> > Maciej
> >
> > Dnia czwartek, 12 listopada 2009 o 20:55:08 Brian Paul napisał(a):
> >> Please update your Mesa from git. I fixed the assertion at line 123
> >> yesterday.
> >>
> >> -Brian
> >>
> >> On Thu, Nov 12, 2009 at 12:23 PM, Maciej Cencora <[email protected]>
> >
> > wrote:
> >>> I've tried your patch (+some minor fixes to make it work) but running
> >>> texdepth with it results in failing assertion rb->Format ==
> >>> MESA_FORMAT_X8_Z24 (s_readpix.c:123).
> >>> I've also tried modifying span functions to convert between Z24_S8 (hw
> >>> format) to S8_Z24 (mesa format) but wasn't able to get correct result.
> >>> Any other ideas?
> >>>
> >>> Maciej
> >>>
> >>> Dnia czwartek, 12 listopada 2009 o 00:18:54 Brian Paul napisał(a):
> >>>> I think the problem is confusion between MESA_FORMAT_Z24_S8 and
> >>>> MESA_FORMAT_S8_Z24 in the radeon drivers.
> >>>>
> >>>> Looking at the span code, it appears that R300, R200 use Z24_S8 format
> >>>> while R600 and others use S8_Z24.
> >>>>
> >>>> Here's a patch that attempts to fix things. I don't have radeon
> >>>> hardware to test so maybe someone else can start with this and finish
> >>>> it up.
> >>>>
> >>>> -Brian
> >>>>
> >>>> 2009/11/11 Maciej Cencora <[email protected]>:
> >>>>> I've checked the other failing tests.
> >>>>> Following were also passing before the texformat-rework merge:
> >>>>> fdo23670-drawpix_stencil
> >>>>> stencil-drawpixels
> >>>>> fragProg1 (Z write test)
> >>>>> readPixSanity
> >>>>> stencil2
> >>>>>
> >>>>> Maciej
> >>>>>
> >>>>> Dnia środa, 11 listopada 2009 o 03:44:18 Brian Paul napisał(a):
> >>>>>> It passes with swrast and the i965 driver here.
> >>>>>>
> >>>>>> Did this test pass prior to the texformat work?
> >>>>>>
> >>>>>> -Brian
> >>>>>>
> >>>>>> 2009/11/10 Maciej Cencora <[email protected]>:
> >>>>>>> It doesn't assert anymore, but the test is still failing.
> >>>>>>>
> >>>>>>> @test: texturing/texdepth
> >>>>>>> info: @@@Returncode: 1\n\nErrors:\nMesa: Mesa 7.7-devel DEBUG build
> >>>>>>> Nov 8 2009 21:21:48\nMesa warning: couldn\'t open libtxc_dxtn.so,
> >>>>>>> software DXTn compression/decompression unavailable\nMesa:
> >>>>>>> Initializing x86-64 optimizations\nMesa: 3Dnow!
> >>>>>>> detected\n\n\nOutput:\nProbe at (80,16)\n Expected: 0.250000
> >>>>>>> 0.250000 0.250000 1.000000\n Observed: 0.000000 0.000000 0.000000
> >>>>>>> 1.000000\nTest failed: \'Render textures GL_LUMINANCE (no shadow
> >>>>>>> functionality)\'\nSee above for details.\n\n
> >>>>>>> errors!
> >>>>>>>
> >>>>>>> Maciej
> >>>>>>>
> >>>>>>> Dnia środa, 11 listopada 2009 o 02:25:52 Brian Paul napisał(a):
> >>>>>>>> Can you try again with Mesa git/master? I've updated the
> >>>>>>>> assertions.
> >>>>>>>>
> >>>>>>>> -Brian
> >>>>>>>>
> >>>>>>>> On Tue, Nov 10, 2009 at 3:43 PM, Maciej Cencora
> >>>>>>>> <[email protected]>
> >>>>>
> >>>>> wrote:
> >>>>>>>>> It is r300 driver (RV530 GPU).
> >>>>>>>>>
> >>>>>>>>> I'm sending the backtrace as attachement.
> >>>>>>>>>
> >>>>>>>>> Maciej
> >>>>>>>>>
> >>>>>>>>> Dnia wtorek, 10 listopada 2009 o 23:38:09 Brian Paul napisał(a):
> >>>>>>>>>> Which driver?
> >>>>>>>>>>
> >>>>>>>>>> Could you provide a stack trace for the failed assertion?
> >>>>>>>>>>
> >>>>>>>>>> -Brian
> >>>>>>>>>>
> >>>>>>>>>> On Tue, Nov 10, 2009 at 3:30 PM, Maciej Cencora
> >>>>>>>>>> <[email protected]>
> >>>>>>>
> >>>>>>> wrote:
> >>>>>>>>>>> Hi Brian,
> >>>>>>>>>>>
> >>>>>>>>>>> there's at least one more regression in the code.
> >>>>>>>>>>> Piglit's texdepth test is failing because of following
> >>>>>>>>>>> assertion: texdepth: swrast/s_readpix.c:122:
> >>>>>>>>>>> read_depth_pixels: Assertion `rb-
> >>>>>>>>>>>
> >>>>>>>>>>>> InternalFormat == 0x81A6' failed.
> >>>>>>>>>>>
> >>>>>>>>>>> There are also other regressions (mostly related to
> >>>>>>>>>>> depth/stencil buffer) but I'm not sure it's the texformat
> >>>>>>>>>>> branch merge is to blame: fdo23670-drawpix_stencil
> >>>>>>>>>>> stencil-drawpixels
> >>>>>>>>>>> fragProg1 (Z write test)
> >>>>>>>>>>> paths
> >>>>>>>>>>> polygonOffset
> >>>>>>>>>>> readPixSanity
> >>>>>>>>>>> stencil2
> >>>>>>>>>>>
> >>>>>>>>>>> Regards,
> >>>>>>>>>>> Maciej
> >>>>>>>>>>>
> >>>>>>>>>>> Dnia piątek, 23 października 2009 o 23:23:34 Brian Paul
> >>>
> >>> napisał(a):
> >>>>>>>>>>>> Alex, Nicolai,
> >>>>>>>>>>>>
> >>>>>>>>>>>> Would you guys please test the texformat-rework branch
> >>>>>>>>>>>> again?
> >>>>>>>>>>>>
> >>>>>>>>>>>> If it looks OK, I'd like to merge to master soon, but
> >>>>>>>>>>>> probably not until next week.
> >>>>>>>>>>>>
> >>>>>>>>>>>> Thanks.
> >>>>>>>>>>>>
> >>>>>>>>>>>> -Brian
> >>>>>>>>>>>>
> >>>>>>>>>>>>
> >>>>>>>>>>>> ------------------------------------------------------------
> >>>>>>>>>>>> --- --- --- --- --- --- Come build with us! The BlackBerry(R)
> >>>>>>>>>>>> Developer Conference in SF, CA is the only developer event
> >>>>>>>>>>>> you need to attend this year. Jumpstart your developing
> >>>>>>>>>>>> skills, take BlackBerry mobile applications to market and
> >>>>>>>>>>>> stay ahead of the curve. Join us from November 9 - 12, 2009.
> >>>>>>>>>>>> Register now! http://p.sf.net/sfu/devconference
> >>>>>>>>>>>> _______________________________________________
> >>>>>>>>>>>> Mesa3d-dev mailing list
> >>>>>>>>>>>> [email protected]
> >>>>>>>>>>>> https://lists.sourceforge.net/lists/listinfo/mesa3d-dev
> >>>>>>>>>>>
> >>>>>>>>>>> -------------------------------------------------------------
> >>>>>>>>>>> --- --- --- --- ----- Let Crystal Reports handle the reporting
> >>>>>>>>>>> - Free Crystal Reports 2008 30-Day trial. Simplify your
> >>>>>>>>>>> report design, integration and deployment - and focus on what
> >>>>>>>>>>> you do best, core application coding. Discover what's new
> >>>>>>>>>>> with Crystal Reports now. http://p.sf.net/sfu/bobj-july
> >>>>>>>>>>> _______________________________________________
> >>>>>>>>>>> Mesa3d-dev mailing list
> >>>>>>>>>>> [email protected]
> >>>>>>>>>>> https://lists.sourceforge.net/lists/listinfo/mesa3d-dev
>
From e526f9752aa7a7e634646edd0da996668840a454 Mon Sep 17 00:00:00 2001
From: Maciej Cencora <[email protected]>
Date: Tue, 17 Nov 2009 21:27:31 +0100
Subject: [PATCH] r300: fix reads and writes for MESA_FORMAT_S8Z24 buffer
Regression was introduced by texformat-rework branch merge.
---
src/mesa/drivers/dri/radeon/radeon_span.c | 5 +++--
1 files changed, 3 insertions(+), 2 deletions(-)
diff --git a/src/mesa/drivers/dri/radeon/radeon_span.c b/src/mesa/drivers/dri/radeon/radeon_span.c
index b3986ef..37904dc 100644
--- a/src/mesa/drivers/dri/radeon/radeon_span.c
+++ b/src/mesa/drivers/dri/radeon/radeon_span.c
@@ -668,7 +668,7 @@ do { \
#define WRITE_DEPTH( _x, _y, d ) \
do { \
GLuint *_ptr = (GLuint*)radeon_ptr_4byte( rrb, _x + x_off, _y + y_off ); \
- *_ptr = CPU_TO_LE32(d); \
+ *_ptr = CPU_TO_LE32((((d) & 0xff000000) >> 24) | (((d) & 0x00ffffff) << 8)); \
} while (0)
#elif defined(RADEON_R600)
#define WRITE_DEPTH( _x, _y, d ) \
@@ -701,7 +701,8 @@ do { \
#if defined(RADEON_R300)
#define READ_DEPTH( d, _x, _y ) \
do { \
- d = LE32_TO_CPU(*(GLuint*)(radeon_ptr_4byte(rrb, _x + x_off, _y + y_off))); \
+ GLuint tmp = (*(GLuint*)(radeon_ptr_4byte(rrb, _x + x_off, _y + y_off))); \
+ d = LE32_TO_CPU(((tmp & 0x000000ff) << 24) | ((tmp & 0xffffff00) >> 8)); \
}while(0)
#elif defined(RADEON_R600)
#define READ_DEPTH( d, _x, _y ) \
--
1.6.3.3
------------------------------------------------------------------------------
Let Crystal Reports handle the reporting - Free Crystal Reports 2008 30-Day
trial. Simplify your report design, integration and deployment - and focus on
what you do best, core application coding. Discover what's new with
Crystal Reports now. http://p.sf.net/sfu/bobj-july
_______________________________________________
Mesa3d-dev mailing list
[email protected]
https://lists.sourceforge.net/lists/listinfo/mesa3d-dev
