Commit Graph

18219 Commits

Author SHA1 Message Date
Brian Paul 4fece21315 mesa: remove old 'sources' file in favor of 'sources.mak' 2009-02-09 09:53:58 -07:00
Brian Paul e97681c7f5 mesa: merge gallium-0.2 into gallium-master-merge
Merge commit 'origin/gallium-0.2' into gallium-master-merge

Conflicts:

	Makefile
	docs/relnotes-7.4.html
	docs/relnotes.html
	src/mesa/drivers/dri/i965/brw_wm.h
	src/mesa/main/imports.c
	src/mesa/main/mtypes.h
	src/mesa/main/texcompress.c
	src/mesa/main/texenvprogram.c
	src/mesa/main/version.h
	src/mesa/vbo/vbo_exec_api.c
	src/mesa/vbo/vbo_save_draw.c
2009-02-09 09:22:22 -07:00
Brian Paul 4900269819 mesa: rework _mesa_reference_framebuffer() to look like _mesa_reference_renderbuffer()
_mesa_unreference_framebuffer() is deprecated since _mesa_reference_framebuffer(ptr, NULL)
can be used instead.
2009-02-09 07:55:08 -07:00
Patrice Mandin b907d4cd8f nouveau: include and calc offset before changing dimensions for next level 2009-02-08 17:04:09 +01:00
Patrice Mandin ea7ca7607a nouveau: upload and swizzle each mipmap level in turn 2009-02-08 17:04:09 +01:00
Corbin Simpson 5425c4aa28 r300: Accidentally removed a pipe_buffer_reference that should be there. 2009-02-08 02:03:29 -08:00
Corbin Simpson 360e700a43 r300: Add SW TCL paths for clear.
This should make things work for people on RSxxx chipsets.
2009-02-08 01:07:03 -08:00
Corbin Simpson ea3398cf33 r300: Update to match pipe_surface changes. 2009-02-08 01:01:26 -08:00
Brian Paul 19a1bc8270 cell: remove unused var 2009-02-07 13:05:38 -07:00
Brian Paul 91948cd1a2 cell: compile fix: many updates to cell texture code for new surface mapping
The Cell texture code really needs a thorough inspection and clean-up someday...
2009-02-07 13:04:53 -07:00
Brian Paul 2473ded886 softpipe: simplify an assertion 2009-02-07 13:03:24 -07:00
Brian Paul b59117a697 cell: compile fix: no-op xlib_create_brw_screen() for Cell build 2009-02-07 13:02:27 -07:00
Brian Paul 96d230e107 cell: compile fix: alpha.ref is now alpha.ref_value 2009-02-07 13:01:53 -07:00
Brian Paul 830e320e2a cell: compile fix: pipe_constant_buffer no longer has size field 2009-02-07 13:01:02 -07:00
Brian Paul c2a8d73d5a cell: compile fix: pipe_constant_buffer no longer has size field 2009-02-07 12:59:40 -07:00
Brian Paul 5199774dc6 mesa: minor fixes to incomplete texture debug code 2009-02-07 11:50:24 -07:00
Brian Paul 266fe93a87 mesa: debug code for printing info about textures, writing teximages to disk 2009-02-07 11:49:52 -07:00
Brian Paul 671fed4d01 mesa: code refactoring: move texcombine code into update_tex_combine() 2009-02-07 11:40:20 -07:00
Brian Paul 2a50dde0f5 mesa: minor clean-ups, remove unneeded conditional 2009-02-07 11:21:44 -07:00
Brian Paul b46611633c mesa: fix logic error in computing enableBits in update_texture_state()
If we had a vertex shader but no fragment shader (i.e. fixed function) we
didn't get the right enabled texture targets.

Fixes blank/white texture problem.
2009-02-07 11:20:08 -07:00
Younes Manton 32cd1a0345 nouveau: Need to surface_copy() without a pipe context. 2009-02-07 12:54:48 -05:00
Corbin Simpson 2d6355495c Merge branch 'gallium-0.2' of git://anongit.freedesktop.org/mesa/mesa into gallium-0.2 2009-02-06 14:06:39 -08:00
Corbin Simpson 4683fc94f5 Merge branch 'gallium-0.2-radeon' into gallium-0.2 2009-02-06 13:34:04 -08:00
Corbin Simpson 80026428e3 Rename winsys amd to radeon. 2009-02-06 13:28:15 -08:00
Younes Manton 776d86606c g3dvl: Catch up to gallium changes, fix build. 2009-02-06 14:37:35 -05:00
Younes Manton bb34072b94 nouveau: Pass proper format to NV04_GDI_RECTANGLE_TEXT. 2009-02-06 14:36:56 -05:00
Younes Manton 5c8c728afe nouveau: Frontbuffer pitch needs to be set. 2009-02-06 14:33:49 -05:00
Brian Paul f6d23943cd mesa: fix tnl->render_inputs_bitset setup for fragment program texcoords
Handle the case where there's no per-vertex texcoords but the fragment shader
needs texcoords.

Fixes piglit shaders/fp-generic/dph test.
2009-02-06 10:48:38 -07:00
Brian Paul 1df62651b2 swrast: return (0,0,0,1) when sampling incomplete textures, not (0,0,0,0)
Fixes piglit shaders/fp-incomplete-tex test.
2009-02-06 10:47:31 -07:00
Brian Paul e01a03d222 glsl: new MESA_GLSL env var for GLSL debugging features
Replaces the VERBOSE_GLSL, VERBOSE_GLSL_DUMP flags which only worked in debug
builds.  MESA_GLSL will work both in debug and non-debug builds.
Also add facility to dump glUniform() calls to stdout.
2009-02-06 10:21:36 -07:00
Brian Paul 6ce0c6e743 mesa: tweak output of _mesa_write_shader_to_file()
Enclose GPU code in comments to the file can be re-fed back into GLSL compiler.
2009-02-06 10:20:33 -07:00
Brian Paul aafcc26642 Revert "mesa: meaningless whitespace change to see if git's working (ignore)"
This reverts commit b2e779988e.

I didn't mean to push this stuff yet.  I'm having a bad git day...
2009-02-06 10:00:34 -07:00
Brian Paul b2e779988e mesa: meaningless whitespace change to see if git's working (ignore) 2009-02-06 09:57:28 -07:00
Dave Airlie da795ff0a8 radeon: remove include that breaks build in !OLD_PACKET path
this path isn't enabled by default in any case.
2009-02-07 00:18:34 +10:00
Corbin Simpson 2e70971e4f r300: Clean up CS counting. 2009-02-06 01:59:26 -08:00
Joakim Sindholt 402d45d99b r300: working trivial/clear for r5xx 2009-02-05 13:37:29 -08:00
Corbin Simpson be53dfa3b9 r300: Add framebuffer setup stub. 2009-02-05 13:27:07 -08:00
Pekka Paalanen e6372853c2 nv20: copy miptree flags from nv40
nv20_miptree_create() should set various flags.
Copy stuff over from nv40.

trivial/tri does not abort on nv04 swizzled copy anymore.
I still miss my triangle.

Signed-off-by: Pekka Paalanen <pq@iki.fi>
2009-02-05 20:35:24 +02:00
Pekka Paalanen a785a4ae21 nv04-nv40: fix nv##_surface_copy() for flipped
If do_flipp is true, it would first do the proper copy, height would
wrap around to unsigned maximum, and then it attempts to do another
copy.

Return after doing the proper copy.

Signed-off-by: Pekka Paalanen <pq@iki.fi>
2009-02-05 20:35:24 +02:00
Pekka Paalanen 8569860c3d nv04: fix pasto in nv04_surface_2d_init()
Wrong hardware object being used, when compared with earlier code.

Signed-off-by: Pekka Paalanen <pq@iki.fi>
2009-02-05 20:35:24 +02:00
Keith Whitwell 96fb896c39 indices: quad fixes 2009-02-05 16:04:38 +00:00
Keith Whitwell 3120894c6d gallium: add new aux lib for index list translations
Could this be the ultimate index list translating utility?  Maybe, but it
doesn't yet include support for splitting primitives.

Unlike previous attempts, this captures all possible combinations of API
and hardware provoking vertex, supports generated list reuse and various
other tricks.  Relies on python-generated code.
2009-02-05 16:04:38 +00:00
Brian Paul 099e9d20f0 gallium: fixup #includes: p_screen.h does not need anything in p_state.h 2009-02-05 08:23:00 -07:00
Brian Paul 0703b2e9ad gallium: move 'struct pipe_winsys'
Not used in p_state.h but used in p_context.h and p_screen.h
2009-02-05 08:16:56 -07:00
Ben Skeggs 75f0b38d9e nv50: stop using nouveau_push.h, it's evil 2009-02-05 18:42:17 +10:00
Ben Skeggs ff8dff017e nv04-nv40: move 2d blit/fill code into pipe driver 2009-02-05 18:22:41 +10:00
Ben Skeggs 13393736db nv50: move 2d blit/fill code into pipe driver 2009-02-05 14:04:45 +10:00
Ben Skeggs ae8a7544d1 nouveau: support getting "native" bo from winsys 2009-02-05 13:18:44 +10:00
Brian Paul 285b500bb7 glsl: use _slang_var_swizzle() in a few places to simplify the code. 2009-02-04 17:40:51 -07:00
Brian Paul d96d8b21bf glsl: remove unused prototype 2009-02-04 17:37:20 -07:00