Age | Commit message (Collapse) | Author |
|
Conflicts:
src/gallium/auxiliary/util/u_format.csv
|
|
|
|
I am pretty sure that this is in gallium spirit, so commit. Thanks to Chia-I
for suggesting this.
|
|
|
|
|
|
This was missed in commit 4b722bf9fde668dff1c2b55b34eb3f86c78f43fb.
dri_extensions.c was removed from Makefile but not from SConscript.
|
|
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.
|
|
|
|
|
|
|
|
|
|
|
|
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%)
|
|
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/*
|
|
|
|
|
|
|
|
|
|
|
|
They will be used by DRISW. Also, add destroy functions.
|
|
|
|
This is a wrapper around dri_st_framebuffer_validate for a single attachment.
Also, call validate through hook to make it more generic.
|
|
dri_st_framebuffer functions just forward to dri1/dri2 functions.
|
|
* ptex is get by flush_frontbuffer, similar to swap_buffers
* comment for allocate_textures
* texture_mask is managed at the st_fb level
|
|
|
|
- put extensions above init_screen
- split out destroy_option_cache
|
|
|
|
|
|
|
|
|
|
This is tested with demos found in progs/demos. However, only the DRI2
path is tested.
|
|
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.
|
|
Remove unused headers and stop marking driDriverAPI as PUBLIC.
|
|
|
|
|
|
|
|
|
|
No idea if this is the correct fix, but it makes it work again at least.
Signed-off-by: Dave Airlie <airlied@redhat.com>
|
|
|
|
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)
|
|
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.
|
|
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.
|
|
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.
|
|
The state trackers need this value so that they can supply it
as the "void *" argument to flush_frontbuffer.
Fixes single-buffer rendering.
|
|
|
|
|
|
Instead of having these functions on a side interface like on
drm_api create a opaque winsys_handle that is to be passed down
into the winsys.
Currently the only thing ported to this new interface is drm_api,
and of that only the components that builds by default is ported.
All the drivers and any extra state trackers needs to be ported
before this can go into master.
|
|
|
|
We probably don't want to propagate this condition to the pipe driver,
this reverts commit f455ca6490fcb65781b21f81c7117bd923e250d1 and the
dri_update_buffer flush altogether until an agreement is reached.
|
|
|