summaryrefslogtreecommitdiffstats
path: root/src/gallium/state_trackers
Commit message (Collapse)AuthorAgeFilesLines
* Merge remote branch 'origin/gallium-st-api-dri'Chia-I Wu2010-03-2113-905/+1345
|\
| * st/dri: fix bug in make_currentGeorge Sapountzis2010-03-201-1/+1
| |
| * st/dri: fix bug in allocate_texturesGeorge Sapountzis2010-03-201-1/+1
| |
| * st/dri: Switch from st_public.h to st_api.h.Chia-I Wu2010-03-1810-558/+393
| | | | | | | | | | This is tested with demos found in progs/demos. However, only the DRI2 path is tested.
| * st/dri: Implement st_api.h callbacks.Chia-I Wu2010-03-185-0/+505
| | | | | | | | | | This commit adds dri_st_api.c that implements st_api.h callbacks. A following commit will switch st/dri from st_public.h to st_api.h.
| * st/dri: Headers and public symbols clean up.Chia-I Wu2010-03-185-14/+8
| | | | | | | | Remove unused headers and stop marking driDriverAPI as PUBLIC.
| * st/dri: Move DRI1 bits in dri_context.c to dri1.c.Chia-I Wu2010-03-183-66/+64
| |
| * st/dri: Move DRI1 bits in dri_drawable.c to dri1.c.Chia-I Wu2010-03-185-319/+336
| |
| * st/dri: Move DRI1 bits in dri_screen.c to dri1.c.Chia-I Wu2010-03-189-82/+173
| |
* | st/vega: fix up vega state tracker to use cso changesRoland Scheidegger2010-03-1913-146/+253
| | | | | | | | | | | | use cso fragment sampler views instead of sampler textures. since we don't really change views, try to store sampler views instead of the textures to avoid having to recreate views most of the time.
* | es: added -I$(TOP)/include pathBrian Paul2010-03-191-0/+1
|/
* st/xorg: fix up xorg state tracker to use cso changesRoland Scheidegger2010-03-166-23/+78
| | | | use cso_set_fragment_sampler_views instead of cso_set_sampler_textures
* Merge commit 'origin/master' into gallium-sampler-viewKeith Whitwell2010-03-1626-789/+1512
|\ | | | | | | | | | | | | This branch already seems to have the nv50_tex.c fix. Conflicts: src/gallium/drivers/nv50/nv50_tex.c
| * Merge remote branch 'origin/gallium-st-api'Chia-I Wu2010-03-1626-788/+1511
| |\
| | * st/glx: Fix glXCopySubBufferMESA.Chia-I Wu2010-03-141-1/+1
| | | | | | | | | | | | Honor the (x, y) and (width, height) pairs.
| | * st/glx: Sync the back buffer to the front buffer.Chia-I Wu2010-03-141-4/+22
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Consider this rendering sequence * render to the back buffer * swap buffers * read from the front buffer The front buffer is expected to have the contents of the back buffer.
| | * st/glx: Add support for GLX_MESA_copy_sub_buffer.Chia-I Wu2010-03-144-6/+53
| | | | | | | | | | | | | | | | | | Create a per-display pipe_context as needed to copy the contents between framebuffer attachments. This allows us to support GLX_MESA_copy_sub_buffer.
| | * st/glx: Add xmesa_display to hold per-display variables.Chia-I Wu2010-03-142-58/+73
| | | | | | | | | | | | | | | | | | This basically adds a static xmesa_display to collect per-display static variables in xm_api.c. Multiple display support is still missing, but this is a step forward.
| | * st/glx: Fix framebuffer validation.Chia-I Wu2010-03-131-24/+29
| | | | | | | | | | | | | | | | | | | | | When xmesa_st_framebuffer_validate was called twice with different sets of attachments, the second call was ignored. Add a texture_mask to remember which textures have been requested to make sure the missing ones get created.
| | * st/glx: Correctly set buffer_mask of a visual.Chia-I Wu2010-03-131-3/+3
| | | | | | | | | | | | Stupid typos again..
| | * st/glx: Make xmesa_create_st_api a callback of xm_driver.Chia-I Wu2010-03-134-19/+9
| | | | | | | | | | | | | | | Instead of guessing the API in st/glx, let the target decide how to create st_api.
| | * st/egl: Fix eglCopyBuffers.Chia-I Wu2010-03-132-13/+22
| | | | | | | | | | | | | | | Use a (real) pipe context to copy between pipe surfaces. Fix a NULL dereference of the temporary native surface created for copying.
| | * st/glx: Fix leaks in xmesa_st_framebuffer.Chia-I Wu2010-03-131-0/+6
| | | | | | | | | | | | | | | The textures and surface of a framebuffer should be unreferenced when the framebuffer is destroyed.
| | * st/glx: Add xm_st.c to SConscript.Chia-I Wu2010-03-121-0/+1
| | |
| | * st/glx: Return a better format in choose_depth_stencil_format.Chia-I Wu2010-03-121-13/+9
| | | | | | | | | | | | | | | Return a better format instead of an exact format in choose_depth_stencil_format. Also, prefer formats with stencil bits.
| | * st/glx: Fix an infinite recursion in flush_front.Chia-I Wu2010-03-121-1/+1
| | | | | | | | | | | | It was a stupid typo by me when I refactored the code.
| | * st/glx: Use st_api.h instead of st_public.h.Chia-I Wu2010-03-126-165/+470
| | |
| | * st/egl: Use st_api.h instead of st_public.h.Chia-I Wu2010-03-126-576/+474
| | | | | | | | | | | | | | | Switch from st_public.h to st_api.h. The latter has intrinsic multiple APIs support and allows various EGLImage extensions to be supported.
| | * winsys/xlib, st/es: Advertise st_api.h support.Chia-I Wu2010-03-123-2/+13
| | | | | | | | | | | | | | | This is done by defining one of st_module_OpenGL_ES1, st_module_OpenGL_ES2, and st_module_OpenGL.
| | * st/mesa: Implement st_api.h.Chia-I Wu2010-03-122-2/+1
| | | | | | | | | | | | | | | | | | | | | | | | There is currently no user of this new interface. As the inteface can coexist with st_public.h, everthing should work as before. ST_TEXTURE_2D is both defined by st_public.h and st_api.h. Reorder the headers in st/dri to avoid conflicts.
| | * st/vega: Implement st_api.h.Chia-I Wu2010-03-127-4/+427
| | | | | | | | | | | | | | | There is currently no user of this new interface. As the inteface can coexist with st_public.h, everthing should work as before.
| * | gallium: fix frontbuffer rendering with r300gDave Airlie2010-03-161-1/+1
| | | | | | | | | | | | | | | | | | No idea if this is the correct fix, but it makes it work again at least. Signed-off-by: Dave Airlie <[email protected]>
* | | Merge commit 'origin/master' into gallium-sampler-viewKeith Whitwell2010-03-151-1/+2
|\| | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: src/gallium/drivers/nv30/nv30_context.h src/gallium/drivers/nv30/nv30_state.c src/gallium/drivers/nv40/nv40_context.h src/gallium/drivers/nv40/nv40_state.c src/gallium/drivers/r300/r300_emit.c
| * | gallium: Respect user's CFLAGS for including X headersDan Nicholson2010-03-131-1/+2
| | | | | | | | | | | | | | | | | | This can break on systems that don't have a system X installation. Signed-off-by: Dan Nicholson <[email protected]>
* | | Merge commit 'origin/master' into gallium-sampler-viewKeith Whitwell2010-03-1317-257/+162
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: src/gallium/auxiliary/util/u_tile.c src/gallium/auxiliary/util/u_tile.h src/gallium/drivers/identity/id_context.c src/gallium/drivers/llvmpipe/lp_setup.c src/gallium/drivers/llvmpipe/lp_setup.h src/gallium/drivers/softpipe/sp_tex_tile_cache.c src/gallium/include/pipe/p_context.h src/mesa/state_tracker/st_cb_bitmap.c src/mesa/state_tracker/st_cb_drawpixels.c
| * | python: Temporarily disable python state tracker until transfers are done by ↵José Fonseca2010-03-131-1/+2
| | | | | | | | | | | | | | | | | | | | | contexts It requires changes not ony to the state tracker but to the python scripts too.
| * | st/egl: Cache the pipe surface used in flush_frontbuffer.Chia-I Wu2010-03-131-7/+15
| | | | | | | | | | | | | | | It is very likely that the same surface will be flushed again and again. Caching the surface should reduce the overhead of surface creation.
| * | st/xorg: Remove flushes no longer necessary thanks to context transfers.Michel Dänzer2010-03-122-21/+0
| | |
| * | Merge branch '7.8'Michel Dänzer2010-03-122-50/+53
| |\ \
| | * | st/dri: Always try to set up R5G6B5 configs.Michel Dänzer2010-03-121-49/+52
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Allows compiz to work in depth 16. The DRI2 getBuffersWithFormat hook is only required for 16/32 bit depth buffers, for colour buffers the only requirement is that the format matches the drawable depth, which we can't check here. (cherry picked from commit c50477c255a34444720fb944c54373462ef39fb9)
| | * | Grammar and spelling fixesJeff Smith2010-03-121-1/+1
| | | | | | | | | | | | | | | | | | | | Signed-off-by: Jeff Smith <[email protected]> Signed-off-by: Brian Paul <[email protected]>
| * | | st/xorg: context transfersKeith Whitwell2010-03-123-42/+42
| | | |
| * | | Merge commit 'origin/gallium-context-transfers-2'Keith Whitwell2010-03-125-28/+25
| |\ \ \ | | |_|/ | |/| |
| | * | gallium: remove pipe_context member from pipe_transferKeith Whitwell2010-03-114-8/+8
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | There was very little use for this beyond permitting the pipe_context::tex_transfer_destroy() function to omit the pipe_context argument. This change adds the pipe_context argument into tex_transfer_destroy() so that it looks like other pipe_context functions, and removes the pipe_context pointer from pipe_transfer.
| | * | Squashed commit of gallium-context-transfers:Keith Whitwell2010-03-115-25/+22
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | commit 7a2ee04629681e59ea147b440856c4f9a33ae9f8 Author: Keith Whitwell <[email protected]> Date: Thu Mar 11 14:19:17 2010 +0000 nv: convert to context transfers commit 188a3f5331c8e5966729fd59d02975afb7324adc Author: Keith Whitwell <[email protected]> Date: Thu Mar 11 14:11:10 2010 +0000 nouveau: remove unused variable commit 5c8e880ab4dc020358c08728b8adb1637d2dc5bc Author: Keith Whitwell <[email protected]> Date: Thu Mar 11 12:31:21 2010 +0000 mesa/st: fix compilation after merge commit c552595333f860c2a4807e195596acdf5d6a5ef8 Author: Keith Whitwell <[email protected]> Date: Thu Mar 11 12:31:06 2010 +0000 util: fix compilation after merge commit e80836878a3617b0e350d2a8f92311832a1476cb Author: Keith Whitwell <[email protected]> Date: Thu Mar 11 12:30:47 2010 +0000 r300g: fix compilation after merge commit 0e4883e9511b9db4e75a4dbc78d7bb970badc15d Author: Keith Whitwell <[email protected]> Date: Thu Mar 11 12:18:45 2010 +0000 i965g: fix incorrect merge commit 17d74133d8168eebf93bf1390de79930fc8da231 Merge: cb81c79 aa311ae Author: Keith Whitwell <[email protected]> Date: Thu Mar 11 12:08:32 2010 +0000 Merge commit 'origin/master' into gallium-context-transfers Conflicts: src/gallium/drivers/i965/brw_screen_texture.c src/gallium/drivers/r300/r300_screen.c src/gallium/drivers/softpipe/sp_texture.c src/gallium/drivers/svga/svga_screen_texture.c src/gallium/state_trackers/egl/x11/native_ximage.c commit cb81c79098bc3a92a4d2a3dcc0edc972dfb407be Author: Keith Whitwell <[email protected]> Date: Tue Mar 2 16:04:01 2010 +0000 egl/x11: hack for context transfers There is a better approach to this in the winsys-handle branch, but for now avoid using transfers at all by always allocating our own backing store directly. commit f44a24e1d4ad7563f3eedd6b3a5688f53a36265c Author: Keith Whitwell <[email protected]> Date: Tue Mar 2 16:03:16 2010 +0000 llvmpipe: context transfers commit 4d7475ef8104b3b478c7c6ce77cd3506c57e25d1 Author: Keith Whitwell <[email protected]> Date: Tue Mar 2 16:02:50 2010 +0000 llvmpipe: disable testprogs build Not working. commit a9bf98c4d36bd92a76f81e83747eb9b8f0a0515f Merge: ee0f97e 0c616da Author: Keith Whitwell <[email protected]> Date: Tue Mar 2 15:28:25 2010 +0000 Merge commit 'origin/master' into gallium-context-transfers Conflicts: src/mesa/state_tracker/st_cb_accum.c src/mesa/state_tracker/st_cb_bitmap.c commit ee0f97e8d9fd5ef57211a8e1268f505c9829e246 Merge: a7f078e 828f545 Author: Keith Whitwell <[email protected]> Date: Fri Feb 19 13:00:29 2010 +0000 Merge commit 'origin/master' into gallium-context-transfers Conflicts: src/gallium/auxiliary/util/u_debug.h src/gallium/drivers/i915/i915_context.h src/gallium/drivers/llvmpipe/lp_flush.c src/gallium/drivers/nv30/nv30_screen.h src/gallium/drivers/nv40/nv40_context.h src/gallium/drivers/nv40/nv40_screen.h src/gallium/drivers/nv50/nv50_context.h src/gallium/drivers/r300/r300_screen.c src/gallium/drivers/r300/r300_winsys.h src/gallium/drivers/softpipe/sp_context.c src/gallium/drivers/trace/tr_context.c src/gallium/state_trackers/dri/dri_context.c src/gallium/state_trackers/egl/common/egl_g3d.c src/gallium/state_trackers/python/st_device.c src/gallium/winsys/drm/radeon/core/radeon_drm.c commit a7f078e16d851b53ef316066dcced46eb39ebe24 Author: Keith Whitwell <[email protected]> Date: Fri Feb 5 14:16:11 2010 +0000 gallium: move texture transfers to pipe_context commit 7b2ffc2019d72e833afea7eebf3e80121187375d Merge: 51e190e c036d13 Author: Keith Whitwell <[email protected]> Date: Fri Feb 5 09:55:02 2010 +0000 Merge commit 'origin/master' into gallium-screen-context Conflicts: src/gallium/winsys/drm/nouveau/drm/nouveau_drm_api.c This branch has got a pretty tortured history now, I expect a squash merge will be appropriate when it is done. commit 51e190e95acf120f72768fafb29e9721e358df1b Author: Keith Whitwell <[email protected]> Date: Thu Feb 4 17:58:02 2010 +0000 gallium: fix some build issues commit f524bdaa723fb181637ad30c6ad708aeedabe25b Merge: f906212 3aba0a2 Author: Keith Whitwell <[email protected]> Date: Thu Feb 4 17:51:32 2010 +0000 Merge commit 'origin/master' into gallium-screen-context commit f9062126883199eabf045714c717cd35f4b7b313 Author: Keith Whitwell <[email protected]> Date: Thu Feb 4 17:17:12 2010 +0000 gallium/docs: small description of screen::create_context commit efcb37bd3d5ed37f06c6105bd2d750b374ec0927 Author: Keith Whitwell <[email protected]> Date: Thu Feb 4 16:42:42 2010 +0000 drm/radeon: more dead create_context wrapper removal commit 6badc0dd9e06cf2ec936940bcf12b9ef5324b301 Author: Keith Whitwell <[email protected]> Date: Thu Feb 4 16:42:30 2010 +0000 drm/i965: more dead create_context wrapper removal commit cf04ebd5a54b18b2d894cfdab2b0f2fd55626ffc Author: Keith Whitwell <[email protected]> Date: Thu Feb 4 16:42:05 2010 +0000 st/python: more dead create_context wrapper removal commit 444f114c3516abf71c430e6e9d0d2ae3b80679d3 Author: Keith Whitwell <[email protected]> Date: Thu Feb 4 16:37:58 2010 +0000 idenity: wrapped context creation commit 5a6d09cb9e468d1ee6c8d54b887618819d8d94f2 Author: Keith Whitwell <[email protected]> Date: Thu Feb 4 16:28:47 2010 +0000 ws/gdi: remove dead context_create wrapper commit 132b55f4bec39386ac625f09aaa11f609664024c Author: Keith Whitwell <[email protected]> Date: Thu Feb 4 16:27:52 2010 +0000 ws/gdi: remove dead context_create wrapper commit 56d2d21a0cdcb197a364049d354c2f15a4fc026a Author: Keith Whitwell <[email protected]> Date: Thu Feb 4 16:25:38 2010 +0000 st/xorg: use screen::context_create commit 838c5cfe56b2af6c644909bed3c5e7cdd64c336a Author: Keith Whitwell <[email protected]> Date: Thu Feb 4 16:23:20 2010 +0000 glx/xlib: simplify creation of trace-wrapped contexts Trace screen knows how to properly wrap context creation in the wrapped screen, so nothing special to do here. commit c99404c03ebaec4175f08a2f363e43c9085f2635 Author: Keith Whitwell <[email protected]> Date: Thu Feb 4 16:18:24 2010 +0000 st/python: no need to special case context creation for trace commit 193a527a682b6877bb1faecd8092df4dfd055a18 Author: Keith Whitwell <[email protected]> Date: Thu Feb 4 16:15:30 2010 +0000 drm/radeon: remove dead create_context declaration commit bb984eecc25cf23bc77e1c818b81165ba1a07c9a Author: Keith Whitwell <[email protected]> Date: Thu Feb 4 16:14:58 2010 +0000 nv/drm: remove dead create_context ref commit e809313a44287dc4e16c28e9e74ef3b2b5271aa1 Author: Keith Whitwell <[email protected]> Date: Thu Feb 4 16:12:51 2010 +0000 st/egl: remove a layer of wrappers around screen::create_context commit 39caa6672a04122f185c22e17aab86d1c40938bf Author: Keith Whitwell <[email protected]> Date: Thu Feb 4 16:05:28 2010 +0000 r300g: fill in screen::context_create commit 407f12556d16ba0656774d8a1d9ebda22f82f473 Author: Keith Whitwell <[email protected]> Date: Thu Feb 4 16:04:04 2010 +0000 cell: adapt for screen::create_context, untested commit d02b0c6ce321a04c76fdabb09e0e4380ce1c1376 Author: Keith Whitwell <[email protected]> Date: Thu Feb 4 15:50:24 2010 +0000 drm/nv: adapt for screen::create_context All contexts now created directly through the screen, so remove equivalent code here. Remove apparently un-needed array of contexts in the winsys. commit 53eec5b1349aa1b6892a75a7bff7e7530957aeae Author: Keith Whitwell <[email protected]> Date: Thu Feb 4 15:50:08 2010 +0000 stw: adapt for screen::create_context, untested commit c6a64de3eb381bc9a88e9fbdecbf87d77925aaf5 Author: Keith Whitwell <[email protected]> Date: Thu Feb 4 15:49:20 2010 +0000 trace: expose the wrapped context's priv data If we are going to keep this priv idea, really want an accessor function for it so that trace and other drivers can wrap that. commit 75d6104e11d86ec2b0749627ed58e35f856ee6eb Author: Keith Whitwell <[email protected]> Date: Thu Feb 4 15:47:55 2010 +0000 nv30: adapt to screen::context_create commit 12f5deb6ed9723e9b5d34577052b8365813ca14e Author: Keith Whitwell <[email protected]> Date: Thu Feb 4 15:44:47 2010 +0000 nv40: adapt to screen::context_create commit 14baccaa3b6bbb3b91056126f6521828e786dc62 Author: Keith Whitwell <[email protected]> Date: Thu Feb 4 15:35:27 2010 +0000 nv50: adapt to screen::create_context Not build tested. Need to figure out how to build nouveau. commit a0e94505ccd2d7f3e604465a2ac302f1286b73b6 Author: Keith Whitwell <[email protected]> Date: Thu Feb 4 15:22:27 2010 +0000 llvmpipe: update for screen::create_context, untested commit 0eae17107c950346030e4f7e0ec232f868d3893d Author: Keith Whitwell <[email protected]> Date: Thu Feb 4 15:16:57 2010 +0000 xlib/llvmpipe: remove dead winsys context creation path commit 2f69f9ffaa7e2a01d2483277246ed13051ae4ca3 Author: Keith Whitwell <[email protected]> Date: Thu Feb 4 14:58:27 2010 +0000 gallium: convert most code to use screen::create_context I wish I could build all of gallium at once to find breakages. commit d7b57f4061b82322cbcae176125913d9f0dea6c1 Author: Keith Whitwell <[email protected]> Date: Thu Feb 4 12:46:21 2010 +0000 glx: permit building with older protocol headers I'd like to be able to build mesa on current distro releases without having to upgrade from the standard dri2proto and glproto headers. With this change I'm able to build on ancient releases such as Ubuntu 9-10... In general, it would be nice to be able to build-test mesa to check for unintended breakages without having to follow the external dependencies of every group working on the codebase. commit 57adedd6fb06c98572ed8d4aef19203df4c4eea2 Merge: da71847 e1906ae Author: Keith Whitwell <[email protected]> Date: Thu Feb 4 11:38:15 2010 +0000 Merge commit 'origin/master' into gallium-screen-context Conflicts: src/gallium/drivers/softpipe/sp_video_context.h src/gallium/drivers/trace/tr_context.c src/gallium/state_trackers/wgl/shared/stw_context.c src/gallium/winsys/gdi/gdi_softpipe_winsys.c commit da71847ea6414d7e352c6094f8963bb4eda344dc Author: José Fonseca <[email protected]> Date: Sat May 2 08:57:39 2009 +0100 wgl: Use pipe_screen::context_create. commit 2595a188f93fd903600ef5d8517737ee0592035d Author: José Fonseca <[email protected]> Date: Sat May 2 08:56:47 2009 +0100 trace: Implement pipe_screen::context_create. commit f3640e4ae37a5260cbfba999d079f827de0a313a Author: José Fonseca <[email protected]> Date: Sat May 2 08:56:17 2009 +0100 softpipe: Implement pipe_screen::context_create. commit 347266bddc8bd39c711bacb2193793759d0f3696 Author: José Fonseca <[email protected]> Date: Sat May 2 08:55:31 2009 +0100 gallium: New pipe_screen::context_create callback.
| * | | st/mesa: don't enable extensions which aren't actually supportedRoland Scheidegger2010-03-111-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | don't enable APPLE_client_storage, TDFX_texture_compression_FXT1, EXT_cull_vertex, NV_vertex_program, NV_vertex_program1_1 - the latter two might work somewhat with some luck. Also don't enable ARB_imaging.
| * | | st/dri: move extension initilization to st/mesa completelyMarek Olšák2010-03-111-99/+3
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Extensions were enabled in both st/mesa and st/dri, with st/dri completely overriding the decisions of st/mesa and exposing even the extensions claimed to be unsupported by a pipe driver. This commit moves the differences between the two to st/mesa and removes the responsibilty of advertising extensions from st/dri.
| * | | Merge remote branch 'origin/7.8'Michel Dänzer2010-03-111-0/+1
| |\ \ \ | | |/ / | |/| / | | |/
| | * st/xorg: Include cursorstr.hJakob Bornecrantz2010-03-111-0/+1
| | |
| * | Merge branch '7.8'Michel Dänzer2010-03-103-0/+20
| |\|
generated by cgit v1.2.3 (git 2.39.1) at 2024-12-25 21:21:08 +0000