diff options
Diffstat (limited to 'src')
| -rw-r--r-- | src/gralloc/gralloc_gem_radeon.c | 4 | ||||
| -rw-r--r-- | src/mesa/vbo/vbo_exec_api.c | 21 |
2 files changed, 3 insertions, 22 deletions
diff --git a/src/gralloc/gralloc_gem_radeon.c b/src/gralloc/gralloc_gem_radeon.c index addb3419a6..469a1488a0 100644 --- a/src/gralloc/gralloc_gem_radeon.c +++ b/src/gralloc/gralloc_gem_radeon.c @@ -223,12 +223,12 @@ drm_gem_radeon_init(struct drm_module_t *drm) drm->gem = (void *) info; -/* ret = eg_init_tile_config(info); + ret = eg_init_tile_config(info); if (ret) { radeon_bo_manager_gem_dtor(info->bufmgr); free(info); return ret; - }*/ + } drm_gem_radeon_init_features(drm); diff --git a/src/mesa/vbo/vbo_exec_api.c b/src/mesa/vbo/vbo_exec_api.c index 3c430b9a05..d9656b3caf 100644 --- a/src/mesa/vbo/vbo_exec_api.c +++ b/src/mesa/vbo/vbo_exec_api.c @@ -432,7 +432,7 @@ do { \ * Flush (draw) vertices. * \param unmap - leave VBO unmapped after flushing? */ -/*static void +static void vbo_exec_FlushVertices_internal(struct vbo_exec_context *exec, GLboolean unmap) { if (exec->vtx.vert_count || unmap) { @@ -444,7 +444,6 @@ vbo_exec_FlushVertices_internal(struct vbo_exec_context *exec, GLboolean unmap) reset_attrfv( exec ); } } -*/ #if FEATURE_beginend @@ -549,24 +548,6 @@ static void GLAPIENTRY vbo_exec_EvalPoint2( GLint i, GLint j ) /** - * Flush (draw) vertices. - * \param unmap - leave VBO unmapped after flushing? - */ -static void -vbo_exec_FlushVertices_internal(struct vbo_exec_context *exec, GLboolean unmap) -{ - if (exec->vtx.vert_count || unmap) { - vbo_exec_vtx_flush( exec, unmap ); - } - - if (exec->vtx.vertex_size) { - vbo_exec_copy_to_current( exec ); - reset_attrfv( exec ); - } -} - - -/** * Called via glBegin. */ static void GLAPIENTRY vbo_exec_Begin( GLenum mode ) |