diff options
| author | Dave Airlie <airlied@redhat.com> | 2009-03-20 10:52:17 +1000 |
|---|---|---|
| committer | Dave Airlie <airlied@redhat.com> | 2009-03-20 10:52:17 +1000 |
| commit | 407e8ae5b167b0193e1e5b1266a5d61ed836dfb5 (patch) | |
| tree | 2d9d05a5c3122f41a13aa8bd9ae921c1176e6b0d /src/gallium/auxiliary/draw/draw_vs_aos_io.c | |
| parent | bdaa0341caffc353fd26bbd91865c2d86eed11c1 (diff) | |
| parent | 114bb54324f22cb53bcd14607234d0acd74d37bd (diff) | |
Merge remote branch 'main/master' into radeon-rewrite
Conflicts:
src/mesa/drivers/dri/r300/r300_cmdbuf.c
src/mesa/drivers/dri/r300/r300_state.c
src/mesa/drivers/dri/r300/r300_swtcl.c
src/mesa/drivers/dri/r300/radeon_ioctl.c
src/mesa/drivers/dri/radeon/radeon_screen.c
Diffstat (limited to 'src/gallium/auxiliary/draw/draw_vs_aos_io.c')
| -rw-r--r-- | src/gallium/auxiliary/draw/draw_vs_aos_io.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/gallium/auxiliary/draw/draw_vs_aos_io.c b/src/gallium/auxiliary/draw/draw_vs_aos_io.c index 39f75b50b7..a6eb37d128 100644 --- a/src/gallium/auxiliary/draw/draw_vs_aos_io.c +++ b/src/gallium/auxiliary/draw/draw_vs_aos_io.c @@ -199,7 +199,7 @@ static boolean load_input( struct aos_compilation *cp, emit_load_R8G8B8A8_UNORM(cp, dataXMM, src); break; default: - ERROR(cp, "unhandled input format"); + AOS_ERROR(cp, "unhandled input format"); return FALSE; } @@ -410,7 +410,7 @@ static boolean emit_output( struct aos_compilation *cp, } break; default: - ERROR(cp, "unhandled output format"); + AOS_ERROR(cp, "unhandled output format"); return FALSE; } |