OpenHarmony/third_party_mesa3d
2
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

python: Use pipe_buffer_* inlines as much as possible.

Browse Source
This commit is contained in:
José Fonseca
2008-09-04 09:33:10 +09:00
parent a3e39a4aa9
commit 78435d9142
4 changed files with 16 additions and 16 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/gallium/state_trackers/python/gallium.i
View File

@@ -46,7 +46,7 @@
#include "pipe/p_shader_tokens.h" #include "pipe/p_shader_tokens.h"
#include "cso_cache/cso_context.h" #include "cso_cache/cso_context.h"
#include "util/u_draw_quad.h" #include "util/u_draw_quad.h"
#include "util/p_tile.h" #include "util/u_tile.h"
#include "tgsi/tgsi_text.h" #include "tgsi/tgsi_text.h"
#include "tgsi/tgsi_dump.h" #include "tgsi/tgsi_dump.h"

10
src/gallium/state_trackers/python/p_context.i
View File

@@ -225,30 +225,30 @@ struct st_context {
const float *vertices) const float *vertices)
{ {
struct pipe_context *pipe = $self->pipe; struct pipe_context *pipe = $self->pipe;
struct pipe_winsys *winsys = pipe->winsys; struct pipe_screen *screen = pipe->screen;
struct pipe_buffer *vbuf; struct pipe_buffer *vbuf;
float *map; float *map;
unsigned size; unsigned size;
size = num_verts * num_attribs * 4 * sizeof(float); size = num_verts * num_attribs * 4 * sizeof(float);
vbuf = winsys->buffer_create(winsys, vbuf = pipe_buffer_create(screen,
32, 32,
PIPE_BUFFER_USAGE_VERTEX, PIPE_BUFFER_USAGE_VERTEX,
size); size);
if(!vbuf) if(!vbuf)
goto error1; goto error1;
map = winsys->buffer_map(winsys, vbuf, PIPE_BUFFER_USAGE_CPU_WRITE); map = pipe_buffer_map(screen, vbuf, PIPE_BUFFER_USAGE_CPU_WRITE);
if (!map) if (!map)
goto error2; goto error2;
memcpy(map, vertices, size); memcpy(map, vertices, size);
pipe->winsys->buffer_unmap(pipe->winsys, vbuf); pipe_buffer_unmap(screen, vbuf);
util_draw_vertex_buffer(pipe, vbuf, prim, num_verts, num_attribs); util_draw_vertex_buffer(pipe, vbuf, prim, num_verts, num_attribs);
error2: error2:
pipe_buffer_reference(pipe->screen, &vbuf, NULL); pipe_buffer_reference(screen, &vbuf, NULL);
error1: error1:
; ;
} }

6
src/gallium/state_trackers/python/p_texture.i
View File

@@ -180,7 +180,7 @@ struct st_buffer {
} }
void write( const char *STRING, unsigned LENGTH, unsigned offset = 0) { void write( const char *STRING, unsigned LENGTH, unsigned offset = 0) {
struct pipe_winsys *winsys = $self->st_dev->screen->winsys; struct pipe_screen *screen = $self->st_dev->screen;
char *map; char *map;
assert($self->buffer->refcount); assert($self->buffer->refcount);
@@ -195,10 +195,10 @@ struct st_buffer {
return; return;
} }
map = winsys->buffer_map(winsys, $self->buffer, PIPE_BUFFER_USAGE_CPU_WRITE); map = pipe_buffer_map(screen, $self->buffer, PIPE_BUFFER_USAGE_CPU_WRITE);
if(map) { if(map) {
memcpy(map + offset, STRING, LENGTH); memcpy(map + offset, STRING, LENGTH);
winsys->buffer_unmap(winsys, $self->buffer); pipe_buffer_unmap(screen, $self->buffer);
} }
} }
}; };

8
src/gallium/state_trackers/python/st_device.c
View File

@@ -292,8 +292,8 @@ void
st_buffer_destroy(struct st_buffer *st_buf) st_buffer_destroy(struct st_buffer *st_buf)
{ {
if(st_buf) { if(st_buf) {
struct pipe_winsys *winsys = st_buf->st_dev->screen->winsys; struct pipe_screen *screen = st_buf->st_dev->screen;
pipe_buffer_reference(pipe->screen, &st_buf->buffer, NULL); pipe_buffer_reference(screen, &st_buf->buffer, NULL);
FREE(st_buf); FREE(st_buf);
} }
} }
@@ -303,7 +303,7 @@ struct st_buffer *
st_buffer_create(struct st_device *st_dev, st_buffer_create(struct st_device *st_dev,
unsigned alignment, unsigned usage, unsigned size) unsigned alignment, unsigned usage, unsigned size)
{ {
struct pipe_winsys *winsys = st_dev->screen->winsys; struct pipe_screen *screen = st_dev->screen;
struct st_buffer *st_buf; struct st_buffer *st_buf;
st_buf = CALLOC_STRUCT(st_buffer); st_buf = CALLOC_STRUCT(st_buffer);
@@ -312,7 +312,7 @@ st_buffer_create(struct st_device *st_dev,
st_buf->st_dev = st_dev; st_buf->st_dev = st_dev;
st_buf->buffer = winsys->buffer_create(winsys, alignment, usage, size); st_buf->buffer = pipe_buffer_create(screen, alignment, usage, size);
if(!st_buf->buffer) { if(!st_buf->buffer) {
st_buffer_destroy(st_buf); st_buffer_destroy(st_buf);
return NULL; return NULL;