diff options
Diffstat (limited to 'src')
| -rw-r--r-- | src/mesa/drivers/dri/r300/r300_emit.h | 11 |
1 files changed, 1 insertions, 10 deletions
diff --git a/src/mesa/drivers/dri/r300/r300_emit.h b/src/mesa/drivers/dri/r300/r300_emit.h index 75f7a39bac6..c7cb93d0ac2 100644 --- a/src/mesa/drivers/dri/r300/r300_emit.h +++ b/src/mesa/drivers/dri/r300/r300_emit.h @@ -201,18 +201,14 @@ static __inline__ uint32_t cmdpacify(void) } /* must be sent to switch to 2d commands */ -/* + void static inline end_3d(PREFIX_VOID) { LOCAL_VARS (void)cmd_reserved; (void)cmd_written; cmd=(drm_radeon_cmd_header_t *) r300AllocCmdBuf(rmesa, \ -<<<<<<< r300_emit.h 1, \ -======= - 0, \ // ??! ->>>>>>> 1.10 __FUNCTION__); \ cmd[0].header.cmd_type=R300_CMD_END3D; @@ -224,16 +220,11 @@ LOCAL_VARS (void)cmd_reserved; (void)cmd_written; cmd=(drm_radeon_cmd_header_t *) r300AllocCmdBuf(rmesa, \ -<<<<<<< r300_emit.h 1, \ -======= - 0, \ // ??! ->>>>>>> 1.10 __FUNCTION__); \ cmd[0].i=cmdcpdelay(count); } -*/ void static inline cp_wait(PREFIX unsigned char flags) { |