Patrice Mandin [Tue, 24 Jun 2008 19:04:37 +0000 (21:04 +0200)]
nv30: add context value
Ben Skeggs [Tue, 24 Jun 2008 18:08:17 +0000 (04:08 +1000)]
nouveau: major thinko
Ben Skeggs [Tue, 24 Jun 2008 18:05:11 +0000 (04:05 +1000)]
Merge remote branch 'upstream/gallium-0.1' into nouveau-gallium-0.1
Brian Paul [Tue, 24 Jun 2008 14:47:15 +0000 (08:47 -0600)]
gallium: remove some old dispatch code
Brian Paul [Tue, 24 Jun 2008 14:45:59 +0000 (08:45 -0600)]
gallium: remove bad assertion
Jakob Bornecrantz [Tue, 24 Jun 2008 14:06:59 +0000 (16:06 +0200)]
gallium: Fix whole source being used in u_blit
José Fonseca [Tue, 24 Jun 2008 13:26:19 +0000 (22:26 +0900)]
Fix CRLF line endings.
José Fonseca [Tue, 24 Jun 2008 13:17:39 +0000 (22:17 +0900)]
Allow CRLF automatic conversion on MSVC project files.
MSVC doesn't really care, and it is frequently causing merge conflicts.
Jakob Bornecrantz [Tue, 24 Jun 2008 12:42:12 +0000 (14:42 +0200)]
i915: Create a texture and surface for shared frontbuffer
Jakob Bornecrantz [Tue, 24 Jun 2008 12:19:30 +0000 (14:19 +0200)]
i915: Added texture_blanket function
Jakob Bornecrantz [Tue, 24 Jun 2008 11:09:43 +0000 (13:09 +0200)]
i915: Moved screen creation to intel_be_device
Jakob Bornecrantz [Tue, 24 Jun 2008 11:00:42 +0000 (13:00 +0200)]
gallium: Fix warning in u_blit.h
Jakob Bornecrantz [Tue, 24 Jun 2008 12:30:38 +0000 (14:30 +0200)]
egl: Stdint was missing from eglconfigutil.h
José Fonseca [Tue, 24 Jun 2008 11:44:47 +0000 (20:44 +0900)]
mesa: Fix Windows GDI winsys build.
José Fonseca [Tue, 24 Jun 2008 05:22:09 +0000 (14:22 +0900)]
gallium: Avoid double arithmetic.
José Fonseca [Tue, 24 Jun 2008 05:18:07 +0000 (14:18 +0900)]
mesa: Use standard integer types.
Especially get rid of the non-portable long long.
José Fonseca [Tue, 24 Jun 2008 05:02:24 +0000 (14:02 +0900)]
mesa: Replace deprecated __MSC__ macro.
José Fonseca [Tue, 24 Jun 2008 05:00:10 +0000 (14:00 +0900)]
dri/intel: Use standard integer types.
José Fonseca [Tue, 24 Jun 2008 04:56:41 +0000 (13:56 +0900)]
gallium: Drop deprecated __MSC__ macro.
José Fonseca [Tue, 24 Jun 2008 04:55:38 +0000 (13:55 +0900)]
egl: Use standard integer types.
José Fonseca [Tue, 24 Jun 2008 04:51:52 +0000 (13:51 +0900)]
mesa/dri: User standard integer types.
José Fonseca [Tue, 24 Jun 2008 04:12:41 +0000 (13:12 +0900)]
mesa: More signed/unsigned float/integer fixes.
José Fonseca [Tue, 24 Jun 2008 04:00:03 +0000 (13:00 +0900)]
mesa: WGL is not part of the WinCE API.
Although it would be interesting having the GDI winsys running on WinCE
several Windows GDI API functions and data structures are missing from
WinCE headers, making this far from a trivial endeavor.
José Fonseca [Tue, 24 Jun 2008 02:40:25 +0000 (11:40 +0900)]
gdi: Update for surface_alloc_storage changes.
José Fonseca [Tue, 24 Jun 2008 02:34:46 +0000 (11:34 +0900)]
mesa: Use appropriate unsigned/signed, float/integer types.
José Fonseca [Tue, 24 Jun 2008 02:33:03 +0000 (11:33 +0900)]
mesa: Use _mesa_bsearch.
José Fonseca [Tue, 24 Jun 2008 01:58:55 +0000 (10:58 +0900)]
mesa: bsearch implementation for WinCE.
José Fonseca [Tue, 24 Jun 2008 01:56:36 +0000 (10:56 +0900)]
mesa: Replace abort by asserts.
José Fonseca [Tue, 24 Jun 2008 01:18:08 +0000 (10:18 +0900)]
mesa: Move variable declarations to the scope top.
José Fonseca [Tue, 24 Jun 2008 01:17:32 +0000 (10:17 +0900)]
mesa: Don't include sys/types.h on WinCE.
We probably shouldn't be including sys/types.h at all, but let's leave that
for another time.
Brian Paul [Mon, 23 Jun 2008 23:13:14 +0000 (17:13 -0600)]
gallium: added support for fixed-point formats, drawing
Jonathan White [Mon, 23 Jun 2008 22:24:58 +0000 (16:24 -0600)]
gallium: code for PIPE_SUBSYSTEM_WINDOWS_USER
Patrice Mandin [Mon, 23 Jun 2008 19:46:51 +0000 (21:46 +0200)]
nv30: add state zsa, based on nv40 one
Patrice Mandin [Mon, 23 Jun 2008 19:37:41 +0000 (21:37 +0200)]
nv30: add state viewport, based on nv40 one
Patrice Mandin [Mon, 23 Jun 2008 19:13:27 +0000 (21:13 +0200)]
nv30: add state stipple, based on nv40 one
Patrice Mandin [Mon, 23 Jun 2008 18:43:22 +0000 (20:43 +0200)]
nv30: add state scissor, based on nv40 one
Patrice Mandin [Mon, 23 Jun 2008 18:37:27 +0000 (20:37 +0200)]
nv30: add state rasterizer, based on nv40 one
José Fonseca [Mon, 23 Jun 2008 17:37:21 +0000 (02:37 +0900)]
mesa: ASSERT macro is already defined by WinCE headers.
Even when just the standard headers are used....
José Fonseca [Mon, 23 Jun 2008 17:35:50 +0000 (02:35 +0900)]
mesa: No getenv on WinCE.
José Fonseca [Mon, 23 Jun 2008 16:26:22 +0000 (01:26 +0900)]
gallium: Use the more portable PIPE_ARCH_* PIPE_CC_* macros instead of ad-hoc ones.
José Fonseca [Mon, 23 Jun 2008 16:25:20 +0000 (01:25 +0900)]
gallium: WinCE does not have cosf, sinf, etc.
Brian Paul [Mon, 23 Jun 2008 17:27:44 +0000 (11:27 -0600)]
gallium: in softpipe_get_tex_surface() use the pitch specified in the softpipe_texture object.
Fixes a pitch/width mix-up.
Jakob Bornecrantz [Mon, 23 Jun 2008 15:57:45 +0000 (17:57 +0200)]
i915: Add render and texture support for tiled texture and buffers
This is step towards tiled textures and buffer support for
i915. But the tiled attribute is never set.
Brian Paul [Mon, 23 Jun 2008 15:50:09 +0000 (09:50 -0600)]
gallium: fix-up inverted do_copy_texsubimage()
The logic/arithmetic for inverting the src image is a bit simpler now.
Brian Paul [Mon, 23 Jun 2008 15:47:12 +0000 (09:47 -0600)]
gallium: fix Y-inverted copies
Don't require the caller to pass a non-intuitive negative src_y coord anymore
when doing a src-inverted copy.
Brian Paul [Mon, 23 Jun 2008 15:07:56 +0000 (09:07 -0600)]
gallium: remove dead/prototype code
Brian Paul [Mon, 23 Jun 2008 14:54:16 +0000 (08:54 -0600)]
gallium: change surface_copy()'s do_flip to boolean
Brian Paul [Mon, 23 Jun 2008 14:51:00 +0000 (08:51 -0600)]
gallium: fix bad srcy coord if do_flip
Brian Paul [Mon, 23 Jun 2008 14:44:30 +0000 (08:44 -0600)]
gallium: fix bad srcy coord if do_flip
Brian Paul [Mon, 23 Jun 2008 14:35:41 +0000 (08:35 -0600)]
gallium: added some assertions
Brian Paul [Mon, 23 Jun 2008 14:14:14 +0000 (08:14 -0600)]
Don't make libmesa.a or libglapi.a depend on asm_subdirs
Since the asm_subdirs target does not actually create a file, make will
always consider that it needs to be rebuilt. If libmesa.a and libglapi.a
have asm_subdirs as a prerequisite, then they will always need to be
rebuilt, too. The correct order will be preserved by the default target,
though.
This should fix #16358.
Conflicts:
src/mesa/Makefile
cherry-picked from master
Dan Nicholson [Mon, 23 Jun 2008 03:19:35 +0000 (20:19 -0700)]
Create $(TOP)/$(LIB_DIR) for install, too
If `make install' is run without running `make' first, the $(LIB_DIR)
will not be created. This also changes the mkdir a little bit so that it
isn't run if necessary and added `-p' so that it is immune to races.
Dan Nicholson [Mon, 23 Jun 2008 03:29:45 +0000 (20:29 -0700)]
Ensure all objects are built when installing DRI
Jakob Bornecrantz [Mon, 23 Jun 2008 14:01:41 +0000 (16:01 +0200)]
util: Blit can now copy from texture to surface
Jakob Bornecrantz [Mon, 23 Jun 2008 13:54:25 +0000 (15:54 +0200)]
gallium: Add accessor functions to get textures from a st_framebuffer
José Fonseca [Mon, 23 Jun 2008 03:49:45 +0000 (12:49 +0900)]
scons: Update to target WinCE 6.0.
Jakob Bornecrantz [Mon, 23 Jun 2008 10:31:46 +0000 (12:31 +0200)]
gallium: Fix warning in u_draw_quad.h
Jakob Bornecrantz [Thu, 19 Jun 2008 18:28:20 +0000 (20:28 +0200)]
i915: Removed level_offset from i915_texture
All offsets are now on image_offset.
Ben Skeggs [Sun, 22 Jun 2008 14:14:21 +0000 (00:14 +1000)]
nouveau: update for interface changes + hack around gallium x86_64 bustage
Ben Skeggs [Sun, 22 Jun 2008 14:01:17 +0000 (00:01 +1000)]
Merge remote branch 'upstream/gallium-0.1' into nouveau-gallium-0.1
Conflicts:
configs/default
Keith Whitwell [Sun, 22 Jun 2008 12:14:29 +0000 (13:14 +0100)]
draw: fix non-i386 builds
Patrice Mandin [Sat, 21 Jun 2008 20:59:05 +0000 (22:59 +0200)]
Update for extra vertex attributes
Patrice Mandin [Sat, 21 Jun 2008 10:03:05 +0000 (12:03 +0200)]
nv30: Add state for blend
Patrice Mandin [Sat, 21 Jun 2008 08:11:37 +0000 (10:11 +0200)]
nv30: Update nouveau_class.h to get its proper defines instead of using nv40 ones
Brian [Sat, 21 Jun 2008 00:29:23 +0000 (18:29 -0600)]
gallium: s/feadback/feedback/, duh
Brian Paul [Fri, 20 Jun 2008 23:28:42 +0000 (17:28 -0600)]
gallium: fix invalid call to draw_set_mapped_constant_buffer()
We were indexing sp_constants[i] outside the loop so i was 2.
Replace i with PIPE_SHADER_VERTEX.
Also, replace magic '2' with PIPE_SHADER_TYPES in a few places.
Brian Paul [Fri, 20 Jun 2008 21:58:19 +0000 (15:58 -0600)]
gallium: fix some surface usage bugs
When a surface is created with GPU_WRITE that really means "GPU render"
and that can involve reads (blending). Set surface usage to
PIPE_BUFFER_USAGE_CPU_READ + WRITE. Fixes progs/demos/lodbias demo.
Also, mark texture as 'modified' when mapped for writing so that the tile
cache can know when to freshen a cached tile. Fixes glTexSubImage2D().
Brian Paul [Fri, 20 Jun 2008 20:30:21 +0000 (14:30 -0600)]
egl: added cpp assertions/sanity checks
Brian Paul [Fri, 20 Jun 2008 20:29:49 +0000 (14:29 -0600)]
mesa: init ctx->RenderMode
Brian Paul [Fri, 20 Jun 2008 20:28:59 +0000 (14:28 -0600)]
egl: added null ptr check
Patrice Mandin [Fri, 20 Jun 2008 20:19:22 +0000 (22:19 +0200)]
nv30: Add separate nv30 state stuff for fb, based on nv40 one, need to use it now
Brian Paul [Fri, 20 Jun 2008 17:49:25 +0000 (11:49 -0600)]
mesa: GL_BYTE vertex/texcoord arrays
Brian Paul [Fri, 20 Jun 2008 17:32:22 +0000 (11:32 -0600)]
mesa: initial support for fixed-pt vertex arrays
Brian Paul [Fri, 20 Jun 2008 17:31:05 +0000 (11:31 -0600)]
mesa: refactor: move initialization of DefaultPacking state.
Brian Paul [Fri, 20 Jun 2008 17:30:43 +0000 (11:30 -0600)]
gallium: always need st_init-blit()
Brian Paul [Fri, 20 Jun 2008 17:30:21 +0000 (11:30 -0600)]
gallium: remove unneeded #include
Brian Paul [Fri, 20 Jun 2008 17:15:30 +0000 (11:15 -0600)]
mesa: fix errors in prev commit
Brian Paul [Fri, 20 Jun 2008 17:05:00 +0000 (11:05 -0600)]
mesa: revamp glBlendFunc loopback
Brian Paul [Fri, 20 Jun 2008 17:04:37 +0000 (11:04 -0600)]
mesa: added _vbo_Materialfv()
Brian Paul [Fri, 20 Jun 2008 16:48:14 +0000 (10:48 -0600)]
mesa: _vbo_Color4f, _vbo_Normal3f, _vbo_MultiTexCoord4f functions
Brian Paul [Fri, 20 Jun 2008 16:47:38 +0000 (10:47 -0600)]
mesa: fix some FEATURE_x tests
Brian Paul [Fri, 20 Jun 2008 16:20:47 +0000 (10:20 -0600)]
egl: added null ptr checks
Brian Paul [Fri, 20 Jun 2008 16:20:25 +0000 (10:20 -0600)]
egl: implment EGL_LARGEST_PBUFFER query
Brian Paul [Fri, 20 Jun 2008 16:20:06 +0000 (10:20 -0600)]
egl: added null ptr check
Brian Paul [Fri, 20 Jun 2008 16:19:51 +0000 (10:19 -0600)]
egl: default API should be ES
Brian Paul [Fri, 20 Jun 2008 14:09:59 +0000 (08:09 -0600)]
gallium: assorted FEATURE tests
Brian Paul [Fri, 20 Jun 2008 14:09:46 +0000 (08:09 -0600)]
gallium: remove unneeded #include
Brian Paul [Fri, 20 Jun 2008 14:07:38 +0000 (08:07 -0600)]
mesa: test for FEATURE_ATI_fragment_shader
Brian Paul [Fri, 20 Jun 2008 03:19:33 +0000 (21:19 -0600)]
egl: fix assorted context-related bugs
Move memset() to proper place.
Added EGL_CONTEXT_CLIENT_VERSION query.
Fix bad return EGL_FALSE -> EGL_TRUE.
Brian Paul [Thu, 19 Jun 2008 22:15:56 +0000 (16:15 -0600)]
gallium: new st_api.c file with token symbol for identifying the API
Brian Paul [Thu, 19 Jun 2008 22:15:09 +0000 (16:15 -0600)]
gallium: remove unused vars
Brian Paul [Thu, 19 Jun 2008 22:12:17 +0000 (16:12 -0600)]
egl: use dlsym() to try to identify APIs
Brian Paul [Thu, 19 Jun 2008 22:06:56 +0000 (16:06 -0600)]
egl: clean up prototype code, new _eglFindAPIs() function.
Jakob Bornecrantz [Thu, 19 Jun 2008 15:09:09 +0000 (17:09 +0200)]
i915: Fixed cubemap layouts
Apprently we shouldn't do all the advanced layout
operation for none compressed formats.
The compressed code was also broken, its currently
disabled, but should be fixed once i915simple starts
to support compressed formats.
José Fonseca [Thu, 19 Jun 2008 13:57:33 +0000 (22:57 +0900)]
gallium: Handle malloc failure.
Jakob Bornecrantz [Thu, 19 Jun 2008 12:42:17 +0000 (14:42 +0200)]
i915: Refractored and clean up i915_texture.c
José Fonseca [Thu, 19 Jun 2008 12:16:16 +0000 (21:16 +0900)]
gallium: Add extra parenthesis as advised by gcc.
Michal Krol [Thu, 19 Jun 2008 12:06:28 +0000 (14:06 +0200)]
util: Add missing format names.
José Fonseca [Thu, 12 Jun 2008 14:34:21 +0000 (23:34 +0900)]
draw: Fix MSVC integer size conversion warning.
José Fonseca [Thu, 12 Jun 2008 13:19:17 +0000 (22:19 +0900)]
Parse the section:offset instead of the rva+base when reading mapfiles.