intel-hard/intel-hard-graphics
2
0 Fork 0
mirror of https://github.com/elwrcl/intel-hard-graphics.git synced 2026-10-31 19:08:03 +03:00
Code Issues Packages Projects Releases Wiki Activity

nine: Gallium Nine'i Mesa 26.x'e forward-port et

Browse Source 
Nine Mesa 25.2'de silindi. Bu commit onu 26.2 agacina geri getiriyor:
src/gallium/frontends/nine, src/gallium/targets/d3dadapter9, D3D9 ve
d3dadapter basliklari, meson entegrasyonu ve driconf secenekleri.

Silinmesinden sonra gallium'da degisen ve uyum gerektiren yerler:
  - mesa_shader_stage, enum pipe_shader_type'in yerini aldi
  - pipe_surface de-pointerize edildi, create_surface kalkti
  - u_upload_data/alloc artik referans vermiyor; _ref varyantlarina gecildi
  - threaded_context kullanici sabit tamponlarini yuklemiyor (MR 36715),
    tc_set_constant_buffer'da assert(!cb->user_buffer) var. SWVP ve
    fixed-function yollari icin nine_upload_constant_buffer() eklendi.
  - driParseConfigFiles struct API'sine gecti

Ayrica D3D9'un ugradigi ama GL frontend'inin hic gecmedigi uc yolda
surucu hatasi cikti; ucu de burada:

  crocus_query.c   PIPE_QUERY_GPU_FINISHED ele alinmiyordu
  crocus_clear.c   clear_render_target gelen pipe_surface'i crocus_surface'e
                   cast edip ->view okuyordu; Nine kendi surface'ini
                   uretiyor, format crocus_format_for_usage ile yeniden
                   turetiliyor
  tgsi_to_nir.c    TXD'de ddx/ddy bilesen sayisi kirpilmiyordu

Gercek donanimda dogrulandi (8086:0166, crocus, wine 11.0 +
wine-nine-standalone): Max Payne 2, The Witcher EE, Fallout New Vegas,
Warband, L4D1, PAYDAY: The Heist calisiyor.

Co-Authored-By: Claude Opus 5 <[email protected]>
This commit is contained in:
elwrclandClaude Opus 5 committed 2026-09-21 22:57:20 +03:00
1 parent e004b50acd
commit e013642d5c
109 files changed
+43221 -9
Download Patch File Download Diff File Expand all files Collapse all files

No files matched your search

src/gallium/frontends/nine/nine_buffer_upload.c
+284
View File
@@ -0,0 +1,284 @@
/*
*
* Copyright 2009 VMware, Inc.
* Copyright 2016 Axel Davy <[email protected]>
* All Rights Reserved.
*
* SPDX-License-Identifier: MIT
*/
/* Adapted from u_upload_mgr.
* Makes suballocations from bigger allocations,
* while enabling fast mapping. */
#include "pipe/p_defines.h"
#include "util/u_inlines.h"
#include "pipe/p_context.h"
#include "util/u_memory.h"
#include "util/u_math.h"
#include "util/slab.h"
#include "nine_buffer_upload.h"
#include "nine_debug.h"
#define DBG_CHANNEL (DBG_INDEXBUFFER|DBG_VERTEXBUFFER)
struct nine_buffer_group {
unsigned refcount; /* How many sub-buffers live inside the buffer */
struct pipe_resource *resource;
struct pipe_transfer *transfer;
uint8_t *map;
unsigned free_offset; /* Aligned offset to the upload buffer, pointing
* at the first unused byte. */
};
struct nine_subbuffer {
struct nine_buffer_group *parent; /* Can be NULL */
struct pipe_resource *resource; /* The parent resource if apply */
unsigned offset; /* Offset inside the resource */
/* If there is no parent, the resource map. Else NULL. */
struct pipe_transfer *transfer;
uint8_t *map;
};
struct nine_buffer_upload {
struct pipe_context *pipe;
struct slab_mempool buffer_pool;
unsigned buffers_size; /* Size of the big allocated buffers */
unsigned num_buffers;
struct nine_buffer_group *buffers;
};
static void
nine_upload_create_buffer_group(struct nine_buffer_upload *upload,
struct nine_buffer_group *group)
{
struct pipe_resource resource;
struct pipe_screen *screen = upload->pipe->screen;
DBG("Allocating %p %p\n", upload, group);
memset(&resource, 0, sizeof(resource));
resource.target = PIPE_BUFFER;
resource.format = PIPE_FORMAT_R8_UNORM;
resource.bind = PIPE_BIND_VERTEX_BUFFER;
resource.usage = PIPE_USAGE_STREAM;
resource.width0 = upload->buffers_size;
resource.height0 = 1;
resource.depth0 = 1;
resource.array_size = 1;
resource.flags = PIPE_RESOURCE_FLAG_MAP_PERSISTENT |
PIPE_RESOURCE_FLAG_MAP_COHERENT;
group->refcount = 0;
group->resource = screen->resource_create(screen, &resource);
if (group->resource == NULL)
return;
group->map = pipe_buffer_map_range(upload->pipe, group->resource,
0, upload->buffers_size,
PIPE_MAP_WRITE |
#if DETECT_ARCH_X86
PIPE_MAP_ONCE |
#endif
PIPE_MAP_PERSISTENT |
PIPE_MAP_COHERENT,
&group->transfer);
if (group->map == NULL) {
group->transfer = NULL;
pipe_resource_reference(&group->resource, NULL);
return;
}
group->free_offset = 0;
DBG("Success: %p %p\n", group->map, group->map+upload->buffers_size);
}
static void
nine_upload_destroy_buffer_group(struct nine_buffer_upload *upload,
struct nine_buffer_group *group)
{
DBG("%p %p\n", upload, group);
DBG("Release: %p %p\n", group->map, group->map+upload->buffers_size);
assert(group->refcount == 0);
if (group->transfer)
pipe_buffer_unmap(upload->pipe, group->transfer);
if (group->resource)
pipe_resource_reference(&group->resource, NULL);
group->transfer = NULL;
group->map = NULL;
}
struct nine_buffer_upload *
nine_upload_create(struct pipe_context *pipe, unsigned buffers_size,
unsigned num_buffers)
{
struct nine_buffer_upload *upload;
int i;
DBG("\n");
if (!pipe->screen->caps.buffer_map_persistent_coherent)
return NULL;
upload = CALLOC_STRUCT(nine_buffer_upload);
if (!upload)
return NULL;
slab_create(&upload->buffer_pool, sizeof(struct nine_subbuffer), 4096);
upload->pipe = pipe;
upload->buffers_size = align(buffers_size, 4096);
upload->num_buffers = num_buffers;
upload->buffers = CALLOC(num_buffers, sizeof(struct nine_buffer_group));
if (!upload->buffers)
goto buffers_fail;
for (i = 0; i < num_buffers; i++)
nine_upload_create_buffer_group(upload, &upload->buffers[i]);
return upload;
buffers_fail:
slab_destroy(&upload->buffer_pool);
FREE(upload);
return NULL;
}
void
nine_upload_destroy(struct nine_buffer_upload *upload)
{
int i;
DBG("%p\n", upload);
for (i = 0; i < upload->num_buffers; i++)
nine_upload_destroy_buffer_group(upload, &upload->buffers[i]);
slab_destroy(&upload->buffer_pool);
FREE(upload);
}
struct nine_subbuffer *
nine_upload_create_buffer(struct nine_buffer_upload *upload,
unsigned buffer_size)
{
struct nine_subbuffer *buf = slab_alloc_st(&upload->buffer_pool);
struct nine_buffer_group *group = NULL;
unsigned size = align(buffer_size, 4096);
int i = 0;
DBG("%p %d\n", upload, buffer_size);
if (!buf)
return NULL;
for (i = 0; i < upload->num_buffers; i++) {
group = &upload->buffers[i];
if (group->resource &&
group->free_offset + size <= upload->buffers_size)
break;
}
if (i == upload->num_buffers) {
/* Allocate lonely buffer */
struct pipe_resource resource;
struct pipe_screen *screen = upload->pipe->screen;
DBG("Allocating buffer\n");
buf->parent = NULL;
memset(&resource, 0, sizeof(resource));
resource.target = PIPE_BUFFER;
resource.format = PIPE_FORMAT_R8_UNORM;
resource.bind = PIPE_BIND_VERTEX_BUFFER;
resource.usage = PIPE_USAGE_STREAM;
resource.width0 = buffer_size;
resource.height0 = 1;
resource.depth0 = 1;
resource.array_size = 1;
resource.flags = PIPE_RESOURCE_FLAG_MAP_PERSISTENT |
PIPE_RESOURCE_FLAG_MAP_COHERENT;
buf->resource = screen->resource_create(screen, &resource);
if (buf->resource == NULL) {
slab_free_st(&upload->buffer_pool, buf);
return NULL;
}
buf->map = pipe_buffer_map_range(upload->pipe, buf->resource,
0, buffer_size,
PIPE_MAP_WRITE |
#if DETECT_ARCH_X86
PIPE_MAP_ONCE |
#endif
PIPE_MAP_PERSISTENT |
PIPE_MAP_COHERENT,
&buf->transfer);
if (buf->map == NULL) {
pipe_resource_reference(&buf->resource, NULL);
slab_free_st(&upload->buffer_pool, buf);
return NULL;
}
buf->offset = 0;
return buf;
}
DBG("Using buffer group %d\n", i);
buf->parent = group;
buf->resource = NULL;
pipe_resource_reference(&buf->resource, group->resource);
buf->offset = group->free_offset;
group->free_offset += size;
group->refcount += 1;
return buf;
}
void
nine_upload_release_buffer(struct nine_buffer_upload *upload,
struct nine_subbuffer *buf)
{
DBG("%p %p %p\n", upload, buf, buf->parent);
if (buf->parent) {
pipe_resource_reference(&buf->resource, NULL);
buf->parent->refcount--;
if (buf->parent->refcount == 0) {
/* Allocate new buffer */
nine_upload_destroy_buffer_group(upload, buf->parent);
nine_upload_create_buffer_group(upload, buf->parent);
}
} else {
/* lonely buffer */
if (buf->transfer)
pipe_buffer_unmap(upload->pipe, buf->transfer);
pipe_resource_reference(&buf->resource, NULL);
}
slab_free_st(&upload->buffer_pool, buf);
}
uint8_t *
nine_upload_buffer_get_map(struct nine_subbuffer *buf)
{
if (buf->parent) {
DBG("%d\n", buf->parent->refcount);
return buf->parent->map + buf->offset;
}
/* lonely buffer */
return buf->map;
}
struct pipe_resource *
nine_upload_buffer_resource_and_offset(struct nine_subbuffer *buf,
unsigned *offset)
{
*offset = buf->offset;
return buf->resource;
}