projects
/
profile
/
ivi
/
mesa.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
| inline |
side by side
(parent:
c47248b
)
mesa: Replace abort by asserts.
author
José Fonseca
<jrfonseca@tungstengraphics.com>
Tue, 24 Jun 2008 01:56:36 +0000
(10:56 +0900)
committer
José Fonseca
<jrfonseca@tungstengraphics.com>
Tue, 24 Jun 2008 02:00:01 +0000
(11:00 +0900)
src/mesa/glapi/glthread.h
patch
|
blob
|
history
src/mesa/math/m_debug_xform.c
patch
|
blob
|
history
src/mesa/state_tracker/st_atom_sampler.c
patch
|
blob
|
history
src/mesa/state_tracker/st_mesa_to_tgsi.c
patch
|
blob
|
history
diff --git
a/src/mesa/glapi/glthread.h
b/src/mesa/glapi/glthread.h
index
b8e9d5f
..
ad2a635
100644
(file)
--- a/
src/mesa/glapi/glthread.h
+++ b/
src/mesa/glapi/glthread.h
@@
-144,19
+144,19
@@
typedef unsigned int _glthread_Cond;
// #warning Condition variables not implemented.
#define _glthread_INIT_COND(cond) \
-
abort(
);
+
ASSERT(0
);
#define _glthread_DESTROY_COND(name) \
-
abort(
);
+
ASSERT(0
);
#define _glthread_COND_WAIT(cond, mutex) \
-
abort(
);
+
ASSERT(0
);
#define _glthread_COND_SIGNAL(cond) \
-
abort(
);
+
ASSERT(0
);
#define _glthread_COND_BROADCAST(cond) \
-
abort(
);
+
ASSERT(0
);
#endif
diff --git
a/src/mesa/math/m_debug_xform.c
b/src/mesa/math/m_debug_xform.c
index
2af837c
..
0b07b4f
100644
(file)
--- a/
src/mesa/math/m_debug_xform.c
+++ b/
src/mesa/math/m_debug_xform.c
@@
-206,7
+206,8
@@
static int test_transform_function( transform_func func, int psize,
case VAR:
break;
default:
- abort();
+ ASSERT(0);
+ return 0;
}
}
}
diff --git
a/src/mesa/state_tracker/st_atom_sampler.c
b/src/mesa/state_tracker/st_atom_sampler.c
index
9abd0b3
..
1e182ee
100644
(file)
--- a/
src/mesa/state_tracker/st_atom_sampler.c
+++ b/
src/mesa/state_tracker/st_atom_sampler.c
@@
-67,7
+67,7
@@
gl_wrap_to_sp(GLenum wrap)
case GL_MIRROR_CLAMP_TO_BORDER_EXT:
return PIPE_TEX_WRAP_MIRROR_CLAMP_TO_BORDER;
default:
- a
bort(
);
+ a
ssert(0
);
return 0;
}
}
diff --git
a/src/mesa/state_tracker/st_mesa_to_tgsi.c
b/src/mesa/state_tracker/st_mesa_to_tgsi.c
index
a8b6faa
..
150545d
100644
(file)
--- a/
src/mesa/state_tracker/st_mesa_to_tgsi.c
+++ b/
src/mesa/state_tracker/st_mesa_to_tgsi.c
@@
-772,7
+772,8
@@
tgsi_translate_mesa_program(
TGSI_WRITEMASK_XYZW );
break;
default:
- abort();
+ assert(0);
+ return 0;
}
ti += tgsi_build_full_declaration(&fulldecl,
&tokens[ti],