aboutsummaryrefslogtreecommitdiffstats
path: root/src/mesa/drivers/dri/sis
Commit message (Collapse)AuthorAgeFilesLines
* only use __x86_64__, not __amd64__ (bug 15503)Brian Paul2008-04-141-1/+1
|
* DRI interface changes and DRI2 direct rendering support.Kristian Høgsberg2008-03-311-60/+33
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Add DRI2 direct rendering support to libGL and add DRI2 client side protocol code. Extend the GLX 1.3 create drawable functions in glx_pbuffer.c to call into the DRI driver when possible. Introduce __DRIconfig, opaque struct that represents a DRI driver configuration. Get's rid of the open coded __GLcontextModes in the DRI driver interface and the context modes create and destroy functions that the loader was requires to provide. glcore.h is no longer part of the DRI driver interface. The DRI config is GL binding agnostic, that is, not specific to GLX, EGL or other bindings. The core API is now also an extension, and the driver exports a list of extensions as the symbol __driDriverExtensions, which the loader must dlsym() for. The list of extension will always include the DRI core extension, which allows creating and manipulating DRI screens, drawables and contexts. The DRI legacy extension, when available, provides alternative entry points for creating the DRI objects that work with the XF86DRI infrastructure. Change DRI2 client code to not use drm drawables or contexts. We never used drm_drawable_t's and the only use for drm_context_t was as a unique identifier when taking the lock. We now just allocate a unique lock ID out of the DRILock sarea block. Once we get rid of the lock entirely, we can drop this hack. Change the interface between dri_util.c and the drivers, so that the drivers now export the DriverAPI struct as driDriverAPI instead of the InitScreen entry point. This lets us avoid dlsym()'ing for the DRI2 init screen function to see if DRI2 is supported by the driver.
* Use __DRIextension mechanism providing loader functionality to the driver.Kristian Høgsberg2008-02-291-3/+3
| | | | | | | Instead of passing in a fixed struct, the loader now passes in a list of __DRIextension structs, to advertise the functionality it can provide to the driver. Each extension is individually versioned and can be extended or phased out as the interface develops.
* Remove GetMSC DriverAPI function.Kristian Høgsberg2008-02-251-1/+0
| | | | | | | | | | | The DriverAPI is internal to the DRI drivers and GetDrawableMSC obsoletes GetMSC. Also, since the DRI driver interface has not yet been released, just drop the getMSC function from the DRI interface instead using the ABI preserving version mechanism. Finally, using void pointer privates in the DRI interface is not allowed, always pass the actual types around (__DRIdrawable in this case) to enhance type safety and readability of the code.
* Fix sis_dri on ia64.Adam Jackson2008-02-151-0/+2
|
* Replace gl_framebuffer's _ColorDrawBufferMask with _ColorDrawBufferIndexesBrian2008-01-063-16/+19
| | | | | | | Each array element is now a BUFFER_x token rather than a BUFFER_BIT_x bitmask. The number of active color buffers is specified by _NumColorDrawBuffers. This builds on the previous DrawBuffer changes and will help with drivers implementing GL_ARB_draw_buffers.
* Refactor and fix core vblank supportJesse Barnes2007-10-291-0/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | Consolidate support for synchronizing to and retrieving vblank counters. Also fix the core vblank code to return monotonic MSC counters, which are required by some GLX extensions. Adding support for multiple pipes to a low level driver is fairly easy, the Intel 965 driver provides simple example code (see intel_buffers.c:intelWindowMoved()). The new code bumps the media stream counter extension version to 2 and adds a new getDrawableMSC callback. This callback takes a drawablePrivate pointer, which is used to calculate the MSC value seen by clients based on the actual vblank counter(s) returned from the kernel. The new drawable private fields are as follows: - vblSeq - used for tracking vblank counts for buffer swapping - vblFlags - flags (e.g. current pipe), updated by low level driver - msc_base - MSC counter from the last time the current pipe changed - vblank_base - kernel DRM vblank counter from the last time the pipe changed Using the above variables, the core vblank code (in vblank.c) can calculate a monotonic MSC value. The low level DRI drivers are responsible for updating the current pipe (by setting VBLANK_FLAG_SECONDARY for example in vblFlags) along with msc_base and vblank_base whenever the pipe associated with a given drawable changes (again, see intelWindowMoved for an example of this). Drivers should fill in the GetDrawableMSC DriverAPIRec field to point to driDrawableGetMSC32 and add code for pipe switching as outlined above to fully support the new scheme.
* Pull createNewScreen entry point into dri_util.c.Kristian Høgsberg2007-10-101-45/+27
| | | | | | | | This pulls the top level createNewScreen entry point out of the drivers and rewrites __driUtilCreateNewScreen in dri_util.c to be the new entry point. The change moves more logic into the common/ layer and changes the createNewScreen entry point to only be defined in one place.
* Drop __DRInativeDisplay and pass in __DRIscreen pointers instead.Kristian Høgsberg2007-10-101-12/+11
| | | | | | | | | | | | | Many DRI entry points took a __DRInativeDisplay pointer and a screen index as arguments. The only use for the native display pointer was to pass it back to the loader when looking up the __DRIscreen for the given screen index. Instead, let's just pass in the __DRIscreen pointer directly, which let's drop the __DRInativeDisplay type and the getScreen function. The assumption is now that the loader will be able to retrieve context from the __DRIscreen pointer when necessary.
* s/MAX_TEXTURE_LEVELS/SIS_MAX_TEXTURE_LEVELS/ and add assertion (bug 11806)Brian2007-08-021-1/+3
|
* enable ARB_vertex_buffer_object for more dri driversRoland Scheidegger2007-03-131-0/+2
| | | | | | | ARB_vertex_buffer_object looks like a useful extension even for old chips. The drivers should not need any code to be able to use this extension since they just use mesa's vbo code anyway. Newly enabled for i810, mach64, mga, r128, radeon, savage, sis and unichrome.
* Fix/improve framebuffer object reference counting.Brian2007-03-061-1/+1
| | | | | | | Use _mesa_reference_framebuffer() and _mesa_unreference_framebuffer() functions to be sure reference counting is done correctly. Additional assertions are done too. Note _mesa_dereference_framebuffer() renamed to "unreference" as that's more accurate.
* merge current trunk into vbo branchAlan Hourihane2006-11-024-15/+7
|
* switch remaining drivers over to vboKeith Whitwell2006-10-313-7/+7
|
* Want to stop passing x/y/width/height to Clear() function.Brian Paul2006-10-182-35/+21
| | | | | | | The coordinates need to be computed after we've got the hw lock. Code updated to: 1. Ignore all/x/y/width/height/ params passed to Clear func. 2. Pass 0,0,0,0,0 to _swrast_Clear() until they're totally removed.
* Remove a bunch of "ctx->Driver.function = _swrast_Function" lines sinceBrian Paul2006-10-152-31/+1
| | | | | default/fallback functions are already plugged in by the call to _mesa_init_driver_functions().
* Revert the SiS and Unichrome DRM version check changes.Thomas Hellström2006-07-111-23/+1
|
* The SiS and Unichrome drivers assume that the handle to theThomas Hellström2006-07-104-5/+29
| | | | AGP map is equivalent to the AGP physical address. Fix this.
* updates to dri drivers for recent stencil changesKeith Whitwell2006-05-083-6/+8
|
* More GLSL code:Michal Krol2006-04-112-9/+12
| | | | | | | | | | | | - use macros to access and modify render inputs bit-field; - un-alias generic vertex attributes for ARB vertex calls; - use MAX_VERTEX_PROGRAM_ATTRIBS (NV code) or MAX_VERTEX_ATTRIBS (ARB code) in place of VERT_ATTRIB_MAX; - define VERT_ATTRIB_GENERIC0..15 for un-aliased vertex attributes for ARB_vertex_shader; - fix generic attribute index range check in arbprogparse.c; - interface GLSL varyings between vertex and fragment shader; - use 64-bit optimised bitset (bitset.h) for render inputs;
* fix broken assertions so dri drivers compile with -DDEBUG (replace ↵Roland Scheidegger2006-01-301-1/+1
| | | | GL_STENCIL_INDEX8 with GL_STENCIL_INDEX8_EXT). Fix potential problem with drivers which use 32bit z buffers.
* Bug 4996.Brian Paul2005-11-092-2/+2
| | | | | Replace use of FLOAT_TO_USHORT with either CLAMPED_FLOAT_TO_USHORT or UNCLAMPED_FLOAT_TO_USHORT. Same should be done for UBYTE, UINT, etc.
* Add disabled support for GL_EXT_fog_coord. While it seems correct to me, it'sEric Anholt2005-10-264-17/+35
| | | | | | | | not respecting the coords (or perhaps interpreting them differently?) in my testing. However, in the process it led to a fix of a secondary color handling issue where it would be taken from the wrong offset, I believe, based off of reading the r200 driver. Also add a minor tweak to save time in the fog-but-not-specular case.
* Move the front.offset setting above a check to shortcut reallocating buffers ifEric Anholt2005-10-252-5/+6
| | | | | | | | width and height stayed the same. Rely on front.offset pointing at the origin in the window (rather than the origin of the front buffer), and fix the coords in swapbuffers, which were wrong. This is different from other drivers because we've got a back buffer with a 0,0 origin at the window's origin, which makes it more convenient to have the front buffer match it.
* Initial add of some (disabled) SiS 6326 drawing code integrated from Alan Cox'sEric Anholt2005-10-2511-58/+1894
| | | | | | | | last drop I saw, which was in turn based on a code drop of mine. Texturing, culling, and several extensions are unimplemented, and some features could probably be improved. It's untested, but there don't appear to be regressions on the 300-series code, so I'd like to get these bits in now so that it can be worked on as not a huge diff.
* Cut a bunch of code by not trying to precompute the blit commands and insteadEric Anholt2005-10-249-289/+83
| | | | | just do it per blit. No noticable performance difference (or behavior difference, in my tests), and a significant difference in sanity.
* In the last commit I added in a fatal error on unknown base formats so IEric Anholt2005-10-241-0/+14
| | | | | | wouldn't get confused when adding support for new formats. However, it resulted in dying in texenv instead of drawing something undefined for GL_DECAL. Do what GLcore apparently does and just pass the fragment through.
* Fix and enable GL_MESA_ycbcr_texture. Looks fine with yuvrect. I'm slightlyEric Anholt2005-10-243-3/+33
| | | | | concerned that TEXEL_YUV422 looks like TEXEL_YVU422 and TEXEL_VUY422 looks like TEXEL_VYU422 in yuvrect, but I'm happy enough for now.
* Add support for GL_EXT_secondary_color, tested with seccolor test.Eric Anholt2005-10-245-17/+50
|
* Turn off the AGP dispatch path yet again, as it seems to be broken (found withEric Anholt2005-10-241-1/+1
| | | | tuxracer and the upcoming support for secondary color).
* Since we memcpy texture data synchronously to the card, idle the engine beforeEric Anholt2005-10-241-0/+4
| | | | | we start copying. I haven't seen it go wrong before, but I'm pretty sure this fix is correct.
* - Add a few more hardware internal formats that are supported. Some remainingEric Anholt2005-10-244-41/+135
| | | | | | | | ones require custom texstore, so they aren't done yet. - Add YCBCR support commented out, since the yuvsquare test didn't work with just the bits I've added. - Add the no-compression GL_ARB_texture_compression support. - Add the driconf texture depth option and try to respect it.
* Fix the GL_BLEND case (and remove the fallback associated with it) by convertingEric Anholt2005-10-242-27/+16
| | | | the float values to bytes before packing them. Tested with texenv.
* Fix texenv by moving a misplaced check for being in fallback (should cover onlyEric Anholt2005-10-241-2/+5
| | | | | render state, not texture state). While here, move a SIS_FIREVERTICES to a more appropriate location, though it was harmless.
* Add support for GL_ARB_texture_border_clamp and GL_ARB_texture_mirrored_repeat,Eric Anholt2005-10-242-24/+29
| | | | | | | tested using texwrap, fixing the sourcing of border constant values (use the bytes, not the floats!). Remove the fallback on GL_CLAMP_TO_EDGE, which acts properly, and add a note to GL_CLAMP about nonconformance (whcih is what the fallback for CLAMP_TO_EDGE was probably targeting).
* Fix a typo in a fallback string.Eric Anholt2005-10-241-1/+1
|
* Add support for GL_EXT_stencil_wrap by guessing that the skip of two values inEric Anholt2005-10-244-7/+32
| | | | | | | | the register header was meaningful. It turns out those were the proper values for the plain INCR/DECR ops, while what we were using as INCR/DECR were the _WRAP versions. Tested with stencil_wrap (didn't expose normal/_WRAP swapping) and stencilwrap (exposed it nicely) tests. Props to idr for poking me about adding this.
* Bump driver dates for the crasher fixes yesterday.Eric Anholt2005-10-201-1/+1
|
* Make SiS a little more like other drivers: Add SIS_DEBUG (only option beingEric Anholt2005-10-194-9/+63
| | | | | "fall" so far) and make the fallback_force option be no_rast like other drivers. Incidentally, makes no_rast not crash (though it still fails to render).
* Remove some long-dead code.Eric Anholt2005-10-194-215/+0
|
* Bug #4615: Fix the SiS driver for the renderbuffer changes. Previously, allEric Anholt2005-10-1911-197/+252
| | | | | | | drirenderbuffers pointed at screen offset 0 and NULL. Instead, set up the front buffer at startup but leave the others for later, since sis allocates them on demand rather than using the static method of the other non-sis-descendent drivers. Some basic apps work, but fallbacks may be broken still.
* Fix a missed merge for idr's dispatch changes: failure to do driInitExtensionsEric Anholt2005-10-182-1/+12
| | | | | in __driCreateNewScreen_20050727 resulted in crashing in dispatch. Rendering remains broken.
* In gl_texture_image replace IntFormat with InternalFormat and Format withBrian Paul2005-10-051-2/+2
| | | | _BaseFormat to be consistant with gl_renderbuffer.
* Instead of calling _mesa_ResizeBuffersMESA() in the Viewport function,Brian Paul2005-09-142-3/+2
| | | | call driUpdateFramebufferSize() when window size/position changes.
* Replace ctx->Driver.StencilOp/Func/Mask() functions withBrian Paul2005-09-131-6/+8
| | | | ctx->Driver.Stencil*Separate() functions.
* Add new void *addr and __DRIdrawablePrivate parameters toBrian Paul2005-09-041-10/+10
| | | | driNewRenderbuffer().
* minor clean-upsBrian Paul2005-09-041-2/+1
|
* SetBuffer, renderbuffer changesBrian Paul2005-09-034-73/+20
|
* Add Egberts fixes for 64bit architecturesAlan Hourihane2005-08-152-2/+5
| | | | | | Add additional checks for the *DRIRec info structure passed in from the device driver. This ensures that things fallback to indirect rendering if the DDX driver has had modifications (i.e. removal of the drmAddress field).
* Major rip-up of internal function insertion interface. The oldmesa_6_3_1Ian Romanick2005-07-282-2/+2
| | | | | | | | | | | | | | | | | | | | | | _glapi_add_entrypoint has been replaced by a new routine called _glapi_add_dispatch. This new routine dynamically assignes dispatch offsets to functions added. This allows IHVs to add support for extension functions that do not have assigned dispatch offsets. It also means that a driver has no idea what offset will be assigned to a function. The vast majority of the changes in this commit account for that. An additional table, driDispatchRemapTable, is added. Functions not in the Linux OpenGL ABI (i.e., anything not in GL 1.2 + ARB_multitexture) has a fixed offset in this new table. The entry in this table specifies the offset in of the function in the real dispatch table. The internal interface was also bumped from version 20050725 to 20050727. This has been tested with various programs in progs/demos on: radeon (Radeon Mobility M6) r128 (Rage 128 Pro) mga (G400)