diff options
| author | Matt Turner <mattst88@gmail.com> | 2015-02-20 20:18:47 -0800 |
|---|---|---|
| committer | Matt Turner <mattst88@gmail.com> | 2015-02-23 10:49:47 -0800 |
| commit | bfcdb843830bba0190e00e35e3c5c18c4bdb5de1 (patch) | |
| tree | d4e8eebb5d58b3b1ac6caa383bfcda258b19c6c1 /src/gallium | |
| parent | 52049f8fd83f2ef31c2a4d645cfb7d7b2ab518a6 (diff) | |
| download | external_mesa3d-bfcdb843830bba0190e00e35e3c5c18c4bdb5de1.zip external_mesa3d-bfcdb843830bba0190e00e35e3c5c18c4bdb5de1.tar.gz external_mesa3d-bfcdb843830bba0190e00e35e3c5c18c4bdb5de1.tar.bz2 | |
mesa: Use assert() instead of ASSERT wrapper.
Acked-by: Eric Anholt <eric@anholt.net>
Diffstat (limited to 'src/gallium')
| -rw-r--r-- | src/gallium/drivers/softpipe/sp_tex_sample.c | 2 | ||||
| -rw-r--r-- | src/gallium/state_trackers/glx/xlib/glx_api.c | 2 | ||||
| -rw-r--r-- | src/gallium/state_trackers/glx/xlib/xm_api.c | 4 |
3 files changed, 4 insertions, 4 deletions
diff --git a/src/gallium/drivers/softpipe/sp_tex_sample.c b/src/gallium/drivers/softpipe/sp_tex_sample.c index 91f2701..68dcf57 100644 --- a/src/gallium/drivers/softpipe/sp_tex_sample.c +++ b/src/gallium/drivers/softpipe/sp_tex_sample.c @@ -2065,7 +2065,7 @@ img_filter_2d_ewa(struct sp_sampler_view *sp_sview, float F = A*C-B*B/4.0f; /* check if it is an ellipse */ - /* ASSERT(F > 0.0); */ + /* assert(F > 0.0); */ /* Compute the ellipse's (u,v) bounding box in texture space */ float d = -B*B+4.0f*C*A; diff --git a/src/gallium/state_trackers/glx/xlib/glx_api.c b/src/gallium/state_trackers/glx/xlib/glx_api.c index ad80dc0..f59b0ba 100644 --- a/src/gallium/state_trackers/glx/xlib/glx_api.c +++ b/src/gallium/state_trackers/glx/xlib/glx_api.c @@ -1483,7 +1483,7 @@ glXQueryVersion( Display *dpy, int *maj, int *min ) static int get_config( XMesaVisual xmvis, int attrib, int *value, GLboolean fbconfig ) { - ASSERT(xmvis); + assert(xmvis); switch(attrib) { case GLX_USE_GL: if (fbconfig) diff --git a/src/gallium/state_trackers/glx/xlib/xm_api.c b/src/gallium/state_trackers/glx/xlib/xm_api.c index 34be1f7..e6f40c3 100644 --- a/src/gallium/state_trackers/glx/xlib/xm_api.c +++ b/src/gallium/state_trackers/glx/xlib/xm_api.c @@ -441,7 +441,7 @@ create_xmesa_buffer(Drawable d, BufferType type, XMesaDisplay xmdpy = xmesa_init_display(vis->display); XMesaBuffer b; - ASSERT(type == WINDOW || type == PIXMAP || type == PBUFFER); + assert(type == WINDOW || type == PIXMAP || type == PBUFFER); if (!xmdpy) return NULL; @@ -556,7 +556,7 @@ initialize_visual_and_buffer(XMesaVisual v, XMesaBuffer b, GLboolean rgb_flag, Drawable window, Colormap cmap) { - ASSERT(!b || b->xm_visual == v); + assert(!b || b->xm_visual == v); /* Save true bits/pixel */ v->BitsPerPixel = bits_per_pixel(v); |