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

Consistent return values from the bm* functions.

Browse source 
Get aubfile generation working again.
This commit is contained in:
Keith Whitwell 2006-09-07 19:58:16 +00:00
parent 493b2ddecb
commit 3e05902d30
5 changed files with 9 additions and 12 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
src/mesa/drivers/dri/i965/brw_aub.c
View file

@ -270,7 +270,7 @@ static void brw_aub_dump_bmp( struct intel_context *intel,
/* Attempt to prevent monster aubfiles by closing and reopening when
* the state pools wrap.
*/
void brw_aub_wrap( struct intel_context *intel )
static void brw_aub_wrap( struct intel_context *intel )
{
struct brw_context *brw = brw_context(&intel->ctx);
if (intel->aub_file) {

1
src/mesa/drivers/dri/i965/brw_aub.h
View file

@ -165,6 +165,5 @@ struct intel_context;
int brw_aub_init( struct brw_context *brw );
void brw_aub_destroy( struct brw_context *brw );
void brw_aub_wrap( struct intel_context *intel );
#endif

2
src/mesa/drivers/dri/i965/brw_context.c
View file

@ -138,8 +138,6 @@ GLboolean brwCreateContext( const __GLcontextModes *mesaVis,
driInitExtensions( ctx, brw_extensions, GL_FALSE );
brw_aub_init( brw );
brw->intel.vtbl.aub_wrap = brw_aub_wrap;
brw_init_attribs( brw );
brw_init_metaops( brw );

14
src/mesa/drivers/dri/i965/bufmgr_fake.c
View file

@ -598,7 +598,7 @@ int bmInitPool( struct intel_context *intel,
unsigned flags)
{
struct bufmgr *bm = intel->bm;
int retval;
int retval = 0;
LOCK(bm);
{
@ -842,7 +842,7 @@ int bmBufferSubData(struct intel_context *intel,
const void *data )
{
struct bufmgr *bm = intel->bm;
int retval;
int retval = 0;
if (size == 0)
return 0;
@ -969,7 +969,7 @@ unsigned bmBufferOffset(struct intel_context *intel,
struct buffer *buf)
{
struct bufmgr *bm = intel->bm;
unsigned retval;
unsigned retval = 0;
LOCK(bm);
{
@ -1037,7 +1037,7 @@ void *bmMapBuffer( struct intel_context *intel,
unsigned flags )
{
struct bufmgr *bm = intel->bm;
void *retval;
void *retval = NULL;
LOCK(bm);
{
@ -1147,7 +1147,7 @@ void bmBufferSetInvalidateCB(struct intel_context *intel,
int bmValidateBuffers( struct intel_context *intel )
{
struct bufmgr *bm = intel->bm;
int retval;
int retval = 0;
LOCK(bm);
{
@ -1206,12 +1206,12 @@ int bmValidateBuffers( struct intel_context *intel )
bm->need_fence = 1;
}
retval = !bm->fail;
retval = bm->fail ? -1 : 0;
}
UNLOCK(bm);
if (!retval)
if (retval != 0)
_mesa_printf("%s failed\n", __FUNCTION__);
return retval;

2
src/mesa/drivers/dri/i965/intel_batchbuffer.c
View file

@ -178,7 +178,7 @@ GLboolean intel_batchbuffer_flush( struct intel_batchbuffer *batch )
*/
offset = bmBufferOffset(batch->intel, batch->buffer);
if (!bmValidateBuffers( batch->intel )) {
if (bmValidateBuffers( batch->intel ) != 0) {
assert(intel->locked);
bmReleaseBuffers( batch->intel );
retval = GL_FALSE;