AlexIndustrial/mesa
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

i915: Restore the accelerated PBO pixel path functions after GEM changes.

Browse Source 
The fencing code is not required, and waiting on the fences defeated one of
the purposes of the extension, which is to allow asynchronous readpixels.
This commit is contained in:
Eric Anholt
2008-06-18 14:19:18 -07:00
parent 654258a4fe
commit bbe80af457
5 changed files with 5 additions and 24 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/mesa/drivers/dri/i915/Makefile
+3 -5
View File
@@ -6,11 +6,6 @@ LIBNAME = i915_dri.so
MINIGLX_SOURCES = server/intel_dri.c
PIXEL_SOURCES = \
intel_pixel.c \
intel_pixel_read.c \
intel_pixel_draw.c
DRIVER_SOURCES = \
i830_context.c \
i830_metaops.c \
@@ -48,6 +43,9 @@ DRIVER_SOURCES = \
intel_context.c \
intel_decode.c \
intel_ioctl.c \
intel_pixel.c \
intel_pixel_draw.c \
intel_pixel_read.c \
intel_screen.c \
intel_span.c \
intel_state.c \
src/mesa/drivers/dri/i915/i830_context.c
+1 -1
View File
@@ -52,7 +52,7 @@ static void
i830InitDriverFunctions(struct dd_function_table *functions)
{
intelInitDriverFunctions(functions);
// intelInitPixelFuncs(functions);
intelInitPixelFuncs(functions);
i830InitStateFuncs(functions);
i830InitTextureFuncs(functions);
}
src/mesa/drivers/dri/i915/i915_context.c
+1 -1
View File
@@ -94,7 +94,7 @@ static void
i915InitDriverFunctions(struct dd_function_table *functions)
{
intelInitDriverFunctions(functions);
// intelInitPixelFuncs(functions);
intelInitPixelFuncs(functions);
i915InitStateFunctions(functions);
i915InitTextureFuncs(functions);
i915InitFragProgFuncs(functions);
src/mesa/drivers/dri/i915/intel_pixel_read.c
-9
View File
@@ -173,7 +173,6 @@ do_blit_readpixels(GLcontext * ctx,
struct intel_buffer_object *dst = intel_buffer_object(pack->BufferObj);
GLuint dst_offset;
GLuint rowLength;
dri_fence *fence = NULL;
if (INTEL_DEBUG & DEBUG_PIXEL)
_mesa_printf("%s\n", __FUNCTION__);
@@ -275,17 +274,9 @@ do_blit_readpixels(GLcontext * ctx,
}
intel_batchbuffer_flush(intel->batch);
fence = intel->batch->last_fence;
dri_fence_reference(fence);
}
UNLOCK_HARDWARE(intel);
if (fence) {
dri_fence_wait(fence);
dri_fence_unreference(fence);
}
if (INTEL_DEBUG & DEBUG_PIXEL)
_mesa_printf("%s - DONE\n", __FUNCTION__);
src/mesa/drivers/dri/intel/intel_pixel_draw.c
-8
View File
@@ -218,7 +218,6 @@ do_blit_drawpixels(GLcontext * ctx,
struct intel_buffer_object *src = intel_buffer_object(unpack->BufferObj);
GLuint src_offset;
GLuint rowLength;
dri_fence *fence = NULL;
if (INTEL_DEBUG & DEBUG_PIXEL)
_mesa_printf("%s\n", __FUNCTION__);
@@ -323,16 +322,9 @@ do_blit_drawpixels(GLcontext * ctx,
ctx->Color.LogicOp : GL_COPY);
}
intel_batchbuffer_flush(intel->batch);
fence = intel->batch->last_fence;
dri_fence_reference(fence);
}
UNLOCK_HARDWARE(intel);
if (fence) {
dri_fence_wait(fence);
dri_fence_unreference(fence);
}
if (INTEL_DEBUG & DEBUG_PIXEL)
_mesa_printf("%s - DONE\n", __FUNCTION__);