From: <ran...@gm...> - 2010-02-27 06:40:51
Attachments:
nv05_fbo_add_xrgb8.diff
nv05_stencil_op_add.diff
|
Hello all! After unsuccesfull battle with git-send-email I just send these two patches from Kmail. Botch as attachments and inlin, but inline version probably will be damaged in process..... Patch 1: add XRGB8888 into nouveau_fbo.c, makes xmoto actually display its demo, not abort diff --git a/src/mesa/drivers/dri/nouveau/nouveau_fbo.c b/src/mesa/drivers/dri/nouveau/nouveau_fbo.c index 1db8c5d..8464786 100644 --- a/src/mesa/drivers/dri/nouveau/nouveau_fbo.c +++ b/src/mesa/drivers/dri/nouveau/nouveau_fbo.c @@ -215,6 +215,8 @@ get_tex_format(struct gl_texture_image *ti) switch (ti->TexFormat) { case MESA_FORMAT_ARGB8888: return GL_RGBA8; + case MESA_FORMAT_XRGB8888: + return GL_RGB8; case MESA_FORMAT_RGB565: return GL_RGB5; default: Patch 2: add two stencil operation cases in nv04_state_raster.c, allow demos/reflect and demos/dinoshade actually work. Dinoshade still visible broken. Not sure about redbook/stencil, it looks very same on my modified driver with TNT2 and with swrast. But tests/stencil definitely wrong .... So, all cases are in, one just need to figure out correct assignment. diff --git a/src/mesa/drivers/dri/nouveau/nv04_state_raster.c b/src/mesa/drivers/dri/nouveau/nv04_state_raster.c index 5e3788d..6d0b262 100644 --- a/src/mesa/drivers/dri/nouveau/nv04_state_raster.c +++ b/src/mesa/drivers/dri/nouveau/nv04_state_raster.c @@ -61,6 +61,10 @@ get_stencil_op(unsigned op) switch (op) { case GL_KEEP: return 0x1; + case GL_ZERO: + return 0x2; + case GL_REPLACE: + return 0x3; case GL_INCR: return 0x4; case GL_DECR: ----- Tested-off-by: Andrew Randrianasulu <ran...@gm...> |
From: Francisco J. <cur...@ri...> - 2010-03-01 02:25:01
|
ran...@gm... writes: > Hello all! > > After unsuccesfull battle with git-send-email I just send these two patches from Kmail. Botch as attachments and inlin, but inline > version probably will be damaged in process..... > Thanks, both patches pushed (after some minor reformatting: please, use git-format-patch next time). > Patch 1: add XRGB8888 into nouveau_fbo.c, makes xmoto actually display its demo, not abort > > diff --git a/src/mesa/drivers/dri/nouveau/nouveau_fbo.c b/src/mesa/drivers/dri/nouveau/nouveau_fbo.c > index 1db8c5d..8464786 100644 > --- a/src/mesa/drivers/dri/nouveau/nouveau_fbo.c > +++ b/src/mesa/drivers/dri/nouveau/nouveau_fbo.c > @@ -215,6 +215,8 @@ get_tex_format(struct gl_texture_image *ti) > switch (ti->TexFormat) { > case MESA_FORMAT_ARGB8888: > return GL_RGBA8; > + case MESA_FORMAT_XRGB8888: > + return GL_RGB8; > case MESA_FORMAT_RGB565: > return GL_RGB5; > default: > > > Patch 2: add two stencil operation cases in nv04_state_raster.c, allow demos/reflect and demos/dinoshade actually work. Dinoshade > still visible broken. Not sure about redbook/stencil, it looks very same on my modified driver with TNT2 and with swrast. But > tests/stencil definitely wrong .... So, all cases are in, one just need to figure out correct assignment. > > diff --git a/src/mesa/drivers/dri/nouveau/nv04_state_raster.c b/src/mesa/drivers/dri/nouveau/nv04_state_raster.c > index 5e3788d..6d0b262 100644 > --- a/src/mesa/drivers/dri/nouveau/nv04_state_raster.c > +++ b/src/mesa/drivers/dri/nouveau/nv04_state_raster.c > @@ -61,6 +61,10 @@ get_stencil_op(unsigned op) > switch (op) { > case GL_KEEP: > return 0x1; > + case GL_ZERO: > + return 0x2; > + case GL_REPLACE: > + return 0x3; > case GL_INCR: > return 0x4; > case GL_DECR: > > ----- > > Tested-off-by: Andrew Randrianasulu <ran...@gm...> |
From: <ran...@gm...> - 2010-03-01 21:08:47
|
В сообщении от Monday 01 March 2010 02:25:01 Francisco Jerez написал(а): > ran...@gm... writes: > > Hello all! > > > > After unsuccesfull battle with git-send-email I just send these two > > patches from Kmail. Botch as attachments and inlin, but inline version > > probably will be damaged in process..... > > Thanks, both patches pushed (after some minor reformatting: please, use > git-format-patch next time). Like this? > > > Patch 1: add XRGB8888 into nouveau_fbo.c, makes xmoto actually display > > its demo, not abort > > > > diff --git a/src/mesa/drivers/dri/nouveau/nouveau_fbo.c > > b/src/mesa/drivers/dri/nouveau/nouveau_fbo.c index 1db8c5d..8464786 > > 100644 > > --- a/src/mesa/drivers/dri/nouveau/nouveau_fbo.c > > +++ b/src/mesa/drivers/dri/nouveau/nouveau_fbo.c > > @@ -215,6 +215,8 @@ get_tex_format(struct gl_texture_image *ti) > > switch (ti->TexFormat) { > > case MESA_FORMAT_ARGB8888: > > return GL_RGBA8; > > + case MESA_FORMAT_XRGB8888: > > + return GL_RGB8; > > case MESA_FORMAT_RGB565: > > return GL_RGB5; > > default: > > > > > > Patch 2: add two stencil operation cases in nv04_state_raster.c, allow > > demos/reflect and demos/dinoshade actually work. Dinoshade still visible > > broken. Not sure about redbook/stencil, it looks very same on my modified > > driver with TNT2 and with swrast. But tests/stencil definitely wrong .... > > So, all cases are in, one just need to figure out correct assignment. > > > > diff --git a/src/mesa/drivers/dri/nouveau/nv04_state_raster.c > > b/src/mesa/drivers/dri/nouveau/nv04_state_raster.c index 5e3788d..6d0b262 > > 100644 > > --- a/src/mesa/drivers/dri/nouveau/nv04_state_raster.c > > +++ b/src/mesa/drivers/dri/nouveau/nv04_state_raster.c > > @@ -61,6 +61,10 @@ get_stencil_op(unsigned op) > > switch (op) { > > case GL_KEEP: > > return 0x1; > > + case GL_ZERO: > > + return 0x2; > > + case GL_REPLACE: > > + return 0x3; > > case GL_INCR: > > return 0x4; > > case GL_DECR: > > > > ----- > > > > Tested-off-by: Andrew Randrianasulu <ran...@gm...> |
From: <ran...@gm...> - 2010-03-01 22:35:48
Attachments:
0001-Trivially-add-GL_NV_blend_square.patch
|
Another trivial patch: nouveau classic driver has everything needed for GL_NV_blend_square, just expose extension. Tested with tests/blendsquare В сообщении от Monday 01 March 2010 02:25:01 вы написали: > ran...@gm... writes: > > Hello all! > > > > After unsuccesfull battle with git-send-email I just send these two > > patches from Kmail. Botch as attachments and inlin, but inline version > > probably will be damaged in process..... > > Thanks, both patches pushed (after some minor reformatting: please, use > git-format-patch next time). > > > Patch 1: add XRGB8888 into nouveau_fbo.c, makes xmoto actually display > > its demo, not abort > > > > diff --git a/src/mesa/drivers/dri/nouveau/nouveau_fbo.c > > b/src/mesa/drivers/dri/nouveau/nouveau_fbo.c index 1db8c5d..8464786 > > 100644 > > --- a/src/mesa/drivers/dri/nouveau/nouveau_fbo.c > > +++ b/src/mesa/drivers/dri/nouveau/nouveau_fbo.c > > @@ -215,6 +215,8 @@ get_tex_format(struct gl_texture_image *ti) > > switch (ti->TexFormat) { > > case MESA_FORMAT_ARGB8888: > > return GL_RGBA8; > > + case MESA_FORMAT_XRGB8888: > > + return GL_RGB8; > > case MESA_FORMAT_RGB565: > > return GL_RGB5; > > default: > > > > > > Patch 2: add two stencil operation cases in nv04_state_raster.c, allow > > demos/reflect and demos/dinoshade actually work. Dinoshade still visible > > broken. Not sure about redbook/stencil, it looks very same on my modified > > driver with TNT2 and with swrast. But tests/stencil definitely wrong .... > > So, all cases are in, one just need to figure out correct assignment. > > > > diff --git a/src/mesa/drivers/dri/nouveau/nv04_state_raster.c > > b/src/mesa/drivers/dri/nouveau/nv04_state_raster.c index 5e3788d..6d0b262 > > 100644 > > --- a/src/mesa/drivers/dri/nouveau/nv04_state_raster.c > > +++ b/src/mesa/drivers/dri/nouveau/nv04_state_raster.c > > @@ -61,6 +61,10 @@ get_stencil_op(unsigned op) > > switch (op) { > > case GL_KEEP: > > return 0x1; > > + case GL_ZERO: > > + return 0x2; > > + case GL_REPLACE: > > + return 0x3; > > case GL_INCR: > > return 0x4; > > case GL_DECR: > > > > ----- > > > > Tested-off-by: Andrew Randrianasulu <ran...@gm...> |