fdo-mirrors/mesa
1
0
Fork 0
mirror of https://gitlab.freedesktop.org/mesa/mesa.git synced 2026-05-05 07:28:11 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions 2

Merge branch 'upstream-gallium-0.1' into darktama-gallium-0.1

Browse source
This commit is contained in:
Ben Skeggs 2007-12-10 21:09:52 +11:00
commit 18fe9776b4
4 changed files with 8 additions and 12 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
src/mesa/drivers/dri/intel_winsys/intel_context.h
View file

@ -35,7 +35,6 @@
struct pipe_context;
struct pipe_region;
struct intel_context;
struct _DriBufferObject;
struct st_context;

7
src/mesa/pipe/p_winsys.h
View file

@ -45,7 +45,6 @@ struct pipe_buffer_handle;
/** Opaque type */
struct pipe_fence_handle;
struct pipe_region;
struct pipe_surface;
@ -80,12 +79,6 @@ struct pipe_winsys
/**
* flags is bitmask of PIPE_SURFACE_FLAG_RENDER, PIPE_SURFACE_FLAG_TEXTURE
*/
struct pipe_region *(*region_alloc)(struct pipe_winsys *ws,
unsigned size, unsigned flags);
void (*region_release)(struct pipe_winsys *ws, struct pipe_region **r);
unsigned (*surface_pitch)(struct pipe_winsys *ws, unsigned cpp,
unsigned with, unsigned flags);

11
src/mesa/state_tracker/st_draw.c
View file

@ -266,9 +266,14 @@ st_draw_vbo(GLcontext *ctx,
}
else {
/* attribute data is in user-space memory, not a VBO */
uint bytes = (arrays[mesaAttr]->Size
* _mesa_sizeof_type(arrays[mesaAttr]->Type)
* (max_index + 1));
uint bytes;
if (!arrays[mesaAttr]->StrideB) {
bytes = arrays[mesaAttr]->Size
* _mesa_sizeof_type(arrays[mesaAttr]->Type);
} else {
bytes = arrays[mesaAttr]->StrideB * (max_index + 1);
}
/* wrap user data */
vbuffer[attr].buffer

1
src/mesa/state_tracker/st_texture.h
View file

@ -33,7 +33,6 @@
struct pipe_context;
struct pipe_texture;
struct pipe_region;
extern struct pipe_texture *