search for: nouveau_texture

This fixes issues where get_rt_format would see a 0 format because the nouveau_surface had not been properly initialized. Fixes crash on supertuxkart startup (which still fails due to out-of-vram issues). Signed-off-by: Ilia Mirkin <imirkin at alum.mit.edu> --- src/mesa/drivers/dri/nouveau/nouveau_texture.c | 9 +++++++++ 1 file changed, 9 insertions(+) diff --git a/src/mesa/drivers/dri/nouveau/nouveau_texture.c b/src/mesa/drivers/dri/nouveau/nouveau_texture.c index da74e8f..8904389 100644 --- a/src/mesa/drivers/dri/nouveau/nouveau_texture.c +++ b/src/mesa/drivers/dri/nouveau/nouveau_texture.c @@ -...

mesa_texstore expects pixel data, not compressed data. For compressed textures, we want to just copy the bits in without any conversion. Signed-off-by: Ilia Mirkin <imirkin at alum.mit.edu> --- src/mesa/drivers/dri/nouveau/nouveau_texture.c | 65 ++++++++++++++++++++------ 1 file changed, 52 insertions(+), 13 deletions(-) diff --git a/src/mesa/drivers/dri/nouveau/nouveau_texture.c b/src/mesa/drivers/dri/nouveau/nouveau_texture.c index 4626cc3..dc5699c 100644 --- a/src/mesa/drivers/dri/nouveau/nouveau_texture.c +++ b/src/mesa/driver...

...o reason that I can think of off-hand -- nor do I see one for not using the default _mesa_store_*image... Perhaps there was before the AllocTextureImageBuffer thing existed? > >> Signed-off-by: Ilia Mirkin <imirkin at alum.mit.edu> >> --- >> src/mesa/drivers/dri/nouveau/nouveau_texture.c | 65 ++++++++++++++++++++------ >> 1 file changed, 52 insertions(+), 13 deletions(-) >> >> diff --git a/src/mesa/drivers/dri/nouveau/nouveau_texture.c b/src/mesa/drivers/dri/nouveau/nouveau_texture.c >> index 4626cc3..dc5699c 100644 >> --- a/src/mesa/drivers/dri/nou...

...data. For compressed > textures, we want to just copy the bits in without any conversion. > Any reason we cannot use _mesa_store_compressed_*image for this instead of rolling our own? > Signed-off-by: Ilia Mirkin <imirkin at alum.mit.edu> > --- > src/mesa/drivers/dri/nouveau/nouveau_texture.c | 65 ++++++++++++++++++++------ > 1 file changed, 52 insertions(+), 13 deletions(-) > > diff --git a/src/mesa/drivers/dri/nouveau/nouveau_texture.c b/src/mesa/drivers/dri/nouveau/nouveau_texture.c > index 4626cc3..dc5699c 100644 > --- a/src/mesa/drivers/dri/nouveau/nouveau_texture...

...in get_rt_format in nv20_buffer_emit. Apart from adding nouveau_alloc_texture_image_buffer I renamed nouveau_teximage_free. What I am unsure of is the code concerning swrast_texture_image and the test for early return in nouveau_alloc_texture_image_buffer. Viktor src/mesa/drivers/dri/nouveau/nouveau_texture.c | 71 +++++++++++++++++++----- 1 files changed, 56 insertions(+), 15 deletions(-) diff --git a/src/mesa/drivers/dri/nouveau/nouveau_texture.c b/src/mesa/drivers/dri/nouveau/nouveau_texture.c index 0060f46..7757b19 100644 --- a/src/mesa/drivers/dri/nouveau/nouveau_texture.c +++ b/src/mesa/drive...

...I don't have nv04, then again, I think it might not support S3TC? If I you think the patch is mostly OK, I will process your feedback, split generic and nv20 specific part and resend it. Regards Viktor src/mesa/drivers/dri/nouveau/nouveau_surface.c | 14 ++- src/mesa/drivers/dri/nouveau/nouveau_texture.c | 143 ++++++++++++++++++----- src/mesa/drivers/dri/nouveau/nouveau_util.h | 19 +++ src/mesa/drivers/dri/nouveau/nv04_surface.c | 17 +++- src/mesa/drivers/dri/nouveau/nv20_context.c | 4 + src/mesa/drivers/dri/nouveau/nv20_state_tex.c | 10 ++ 6 files changed, 172 insertions...

...>drm->client, NV_DEVICE, ^~~~~~~~~~~~~~~~~~ nouveau_device_del nouveau_screen.c:111:39: error: dereferencing pointer to incomplete type ‘struct nouveau_drm’ ret = nouveau_device_new(&screen->drm->client, NV_DEVICE, ^~ CC nouveau_texture.lo nouveau_screen.c: In function ‘nouveau_destroy_screen’: nouveau_screen.c:230:2: error: implicit declaration of function ‘nouveau_drm_del’; did you mean ‘nouveau_bo_ref’? [-Werror=implicit-function-declaration] nouveau_drm_del(&screen->drm); ^~~~~~~~~~~~~~~ nouveau_bo_ref cc1: some w...

...+++++++++++++ src/mesa/drivers/dri/nouveau/nouveau_state.h | 119 +++ src/mesa/drivers/dri/nouveau/nouveau_surface.c | 81 ++ src/mesa/drivers/dri/nouveau/nouveau_surface.h | 58 ++ src/mesa/drivers/dri/nouveau/nouveau_swtnl_t.c | 354 ++++++++ src/mesa/drivers/dri/nouveau/nouveau_texture.c | 456 +++++++++++ src/mesa/drivers/dri/nouveau/nouveau_texture.h | 49 ++ src/mesa/drivers/dri/nouveau/nouveau_util.h | 176 ++++ src/mesa/drivers/dri/nouveau/nouveau_vbo_t.c | 409 ++++++++++ src/mesa/drivers/dri/nouveau/nv04_context.c | 118 +++ src/mesa/drive...