summaryrefslogtreecommitdiff
path: root/src/gallium/state_trackers
AgeCommit message (Collapse)Author
2010-04-02gallium: fix dri_destroy_option_cache() when optionCache.info is NULLYann Droneaud
With an Intel 855GM handled by intel_drv, there's a crash with Gallium3D enabled DRI driver for Intel i915 (--enable-gallium-intel). The Gallium3D driver doesn't support the 855GM as expected by intel_drv, it failed to open the screen and give an half initialized screen structure to dri_destroy_option_cache(): optionCache.info is NULL, so it's crashing while trying to free array content. This patch at least fix the crash in the function. Here's some logs of the fixed version: [ 16274.137] LoaderOpen(/opt/mesa/lib/xorg/modules/drivers/intel_drv.so) [ 16274.139] (II) Loading /opt/mesa/lib/xorg/modules/drivers/intel_drv.so [ 16274.183] (II) Module intel: vendor="X.Org Foundation" [ 16274.183] compiled for 1.8.0, module version = 2.11.0 [ 16274.183] Module class: X.Org Video Driver [ 16274.183] ABI class: X.Org Video Driver, version 7.0 [ 16274.183] (II) intel: Driver for Intel Integrated Graphics Chipsets: i810, i810-dc100, i810e, i815, i830M, 845G, 852GM/855GM, 865G, 915G, E7221 (i915), 915GM, 945G, 945GM, 945GME, Pineview GM, Pineview G, 965G, G35, 965Q, 946GZ, 965GM, 965GME/GLE, G33, Q35, Q33, GM45, 4 Series, G45/G43, Q45/Q43, G41, B43, Clarkdale, Arrandale [ 16274.382] (II) intel(0): Integrated Graphics Chipset: Intel(R) 855GME [ 16274.382] (--) intel(0): Chipset: "852GM/855GM" [ 16276.675] (II) intel(0): [DRI2] Setup complete [ 16276.675] (II) intel(0): [DRI2] DRI driver: i915 debug_get_option: GALLIUM_TRACE = (null) debug_get_bool_option: GALLIUM_RBUG = FALSE debug_get_bool_option: INTEL_DUMP_CMD = FALSE i915_create_screen: unknown pci id 0x3582, cannot create screen dri_init_screen_helper: failed to create pipe_screen [ 16276.794] (EE) AIGLX error: Calling driver entry point failed [ 16276.794] (EE) AIGLX: reverting to software rendering [ 16276.794] (II) AIGLX: Screen 0 is not DRI capable [ 16276.796] (II) AIGLX: Loaded and initialized /opt/mesa/lib/dri/swrast_dri.so [ 16276.796] (II) GLX: Initialized DRISWRAST GL provider for screen 0 Signed-off-by: Yann Droneaud <yann@droneaud.fr> Reviewed-by: Corbin Simpson <MostAwesomeDude@gmail.com>
2010-04-02st/egl: Add a missing break.Chia-I Wu
The swtich in egl_g3d_st_framebuffer_validate misses a break.
2010-04-01st/python: Allow to sample only in the [0,1] range.José Fonseca
2010-04-01st/python: Always use softpipe as reference driver.José Fonseca
2010-03-31Merge branch 'gallium-new-formats'Roland Scheidegger
Conflicts: src/gallium/auxiliary/util/u_format.csv src/gallium/auxiliary/util/u_format_access.py src/gallium/auxiliary/util/u_format_pack.py
2010-03-31st/python: Generate binding for u_format utility functions too.José Fonseca
2010-03-30st/dri: Remove unnecessary header.Vinson Lee
2010-03-30st/dri: Remove unnecessary header.Vinson Lee
2010-03-30st/dri: Fix a memory leak in dri1_init_screen.Chia-I Wu
Free the returned configs upon errors.
2010-03-29drisw: Remove unnecessary header.Vinson Lee
2010-03-30st/glx: Remove a wrong assertion in choose_pixel_format.Chia-I Wu
There are X visuals that Gallium or the code does not support. We could not assert the color format to be supported. Return PIPE_FORMAT_NONE in such cases and let the caller handle it.
2010-03-30Merge branch 'master' into gallium-new-formatsRoland Scheidegger
Conflicts: src/gallium/auxiliary/util/u_format.csv
2010-03-30gallium: adapt all code to the renamed depth/stencil formatsRoland Scheidegger
2010-03-29st/python: Update for util_draw_vertex_buffer changes.José Fonseca
2010-03-29st/python: Move surface read/write methods to context.José Fonseca
2010-03-29st/dri/sw: add drisw_api similarly to dri1_apiGeorge Sapountzis
I am pretty sure that this is in gallium spirit, so commit. Thanks to Chia-I for suggesting this.
2010-03-29Revert "python: Temporarily disable python state tracker until transfers are ↵José Fonseca
done by contexts" This reverts commit 50a778661930ec7aa875a9c5235e9910143ec700.
2010-03-28st/python: updates for recent interface changesKeith Whitwell
Still problems at runtime with vertex elements, etc. Building still disabled.
2010-03-28drisw: probably better hack for stride and some commentsGeorge Sapountzis
2010-03-27drisw: make stride issue profoundGeorge Sapountzis
2010-03-26st/dri: Fix SCons build.Vinson Lee
This was missed in commit 4b722bf9fde668dff1c2b55b34eb3f86c78f43fb. dri_extensions.c was removed from Makefile but not from SConscript.
2010-03-26swrastg: allow for any of the software rasterizers.George Sapountzis
This function should be put in targets/common or winsys/sw/common and shared with targers/libgl-xlib and winsys/sw/drm. For targets/common, you get layering violations in the build system unless all of drm_api's are moved under targets.
2010-03-26st/dri: add comment about the ifdef in dri_screen.cGeorge Sapountzis
2010-03-26st/dri: factor out common init_screen codeGeorge Sapountzis
2010-03-26st/dri mv __driDriverExtensions to drisw.c and dri2.cGeorge Sapountzis
2010-03-26st/dri: fold dri_extensions.c into dri_context.cGeorge Sapountzis
2010-03-26swrastg: Build with sconsJakob Bornecrantz
2010-03-26st/dri: Move common files to common directoryJakob Bornecrantz
27 files changed, 15 insertions(+), 15 deletions(-) rename src/gallium/state_trackers/dri/{ => common}/dri1_helper.c (100%) rename src/gallium/state_trackers/dri/{ => common}/dri1_helper.h (100%) rename src/gallium/state_trackers/dri/{ => common}/dri_context.c (100%) rename src/gallium/state_trackers/dri/{ => common}/dri_context.h (100%) rename src/gallium/state_trackers/dri/{ => common}/dri_drawable.c (100%) rename src/gallium/state_trackers/dri/{ => common}/dri_drawable.h (100%) rename src/gallium/state_trackers/dri/{ => common}/dri_extensions.c (100%) rename src/gallium/state_trackers/dri/{ => common}/dri_screen.c (100%) rename src/gallium/state_trackers/dri/{ => common}/dri_screen.h (100%) rename src/gallium/state_trackers/dri/{ => common}/dri_st_api.c (100%) rename src/gallium/state_trackers/dri/{ => common}/dri_st_api.h (100%) rename src/gallium/state_trackers/dri/{ => common}/dri_wrapper.h (100%)
2010-03-26st/dri: Reshuffle files and make it obvious which files are sharedJakob Bornecrantz
In short: git mv ../drisw/Makefile dri/sw git mv drisw.[c|h] sw git mv dri2.[c|h] dri1.[c|h] Makefile drm git rm ../drisw ln -s <common files> drm/* ln -s <common files> sw/*
2010-03-25st/dri: Don't include sw vs drm dri headersJakob Bornecrantz
2010-03-25st/dri: Add dri2 prefix for all dri2.c functionsJakob Bornecrantz
2010-03-25st/dri: add TODO list for DRISWGeorge Sapountzis
2010-03-25swrastg_dri: add state_trackerGeorge Sapountzis
2010-03-25st/dri: add driswGeorge Sapountzis
2010-03-25st/dri: add dri_wrapper.hGeorge Sapountzis
2010-03-25st/dri: export DRI1 surface / pipeGeorge Sapountzis
They will be used by DRISW. Also, add destroy functions.
2010-03-25st/dri: split out DRI2 codeGeorge Sapountzis
2010-03-25st/dri: make get_texture into validate_attGeorge Sapountzis
This is a wrapper around dri_st_framebuffer_validate for a single attachment. Also, call validate through hook to make it more generic.
2010-03-25st/dri: flush_frontbuffer, allocate_textures for dri2George Sapountzis
dri_st_framebuffer functions just forward to dri1/dri2 functions.
2010-03-25st/dri: flush_frontbuffer, allocate_textures for dri1George Sapountzis
* ptex is get by flush_frontbuffer, similar to swap_buffers * comment for allocate_textures * texture_mask is managed at the st_fb level
2010-03-25st/dri: minor cosmetic for buffersGeorge Sapountzis
2010-03-25st/dri: minor cosmetic for screenGeorge Sapountzis
- put extensions above init_screen - split out destroy_option_cache
2010-03-25st/dri: add inline for dri2 check done in multiple placesGeorge Sapountzis
2010-03-25st/dri: Fix for X server 1.6.0 (DRI2 version 1)Jakob Bornecrantz
2010-03-23st/glx: add support for multiple displaysBrian Paul
This is a quick & dirty solution, but it works. See comments in the code for other ideas. Fixes regressions/breakage seen in progs/xdemos/glxheads, etc. from commit 6632915e957149c153a3f793c400a532b4995b18.
2010-03-23Change libX11 variables to not conflict with AC_PATH_XTRADan Nicholson
The variable X_LIBS from AC_PATH_XTRA contains only the -L searchdir parameter and not the -lX11 to link to Xlib. Use X11 prefixed build vars for linking with Xlib to avoid the conflict. Signed-off-by: Dan Nicholson <dbn.lists@gmail.com>
2010-03-22st/glx: fix depth/stencil format selection codeBrian Paul
This fixes a pretty big performance regression caused by commit 3475e88442c16fb2b50b903fe246b3ebe49da226. When the user does not request a stencil buffer it's important that we don't use a depth/stencil format (or at least make it our last choice). If the user calls glClear(GL_DEPTH_BUFFER_BIT) when we have a combined depth/stencil buffer, that causes us to hit the clear_with_quad() path which can be much, much slower than calling pipe_context::clear(). Also, try to use a shallower depth format before a deeper one.
2010-03-21Merge remote branch 'origin/gallium-st-api-dri'Chia-I Wu
2010-03-20st/dri: fix bug in make_currentGeorge Sapountzis
2010-03-20st/dri: fix bug in allocate_texturesGeorge Sapountzis