Commit graph

17567 commits

Author SHA1 Message Date
Keith Whitwell
05f8e41b95 xlib: combine and eliminate some header files 2009-01-09 14:31:45 +00:00
Keith Whitwell
e3734593ae Merge commit 'origin/gallium-0.2' into gallium-xlib-rework
Conflicts:

	progs/glsl/Makefile
2009-01-09 10:08:06 +00:00
Keith Whitwell
221352bbd7 xlib: strip out glXAllocateMemoryMESA & friends 2009-01-08 16:35:05 +00:00
Keith Whitwell
44a9f505d7 xlib: remove VMS tweaks, these should be moved to p_compiler.h if needed 2009-01-08 16:14:45 +00:00
Keith Whitwell
3afe1e42d7 xlib: remove unsued _glxapi_get_extensions func 2009-01-08 16:14:01 +00:00
Keith Whitwell
ee2876316a xlib: strip out some unused XMesa api functions 2009-01-08 16:05:45 +00:00
Keith Whitwell
92e23ef81f xlib: rename xfonts.c to fakeglx_fonts.c 2009-01-08 15:47:32 +00:00
Keith Whitwell
25deb852f8 xlib: rename old_xmesa.h to xm_api.h 2009-01-08 15:42:56 +00:00
Keith Whitwell
e83e2c4792 xlib: remove XMesaMakeCurrent, use XMesaMakeCurrent2 always 2009-01-08 15:40:58 +00:00
Keith Whitwell
2b960128e8 xlib: remove old xmesa_x.h file and all its defines 2009-01-08 15:35:35 +00:00
Keith Whitwell
153b4d5cdd xlib: remove some XMesa types, just use the native Xlib ones 2009-01-08 15:35:35 +00:00
Brian Paul
a129c7268a cell: fix breakage from xlib re-org
Some of these fixes are quick band-aids for now.
2009-01-08 08:30:11 -07:00
Keith Whitwell
94222d58e7 xlib: strip out more 3dfx stuff 2009-01-08 15:10:41 +00:00
Keith Whitwell
9ed74c61d4 xlib: pull in private copies of the GL/xmesa*.h headers 2009-01-08 15:10:05 +00:00
Keith Whitwell
cae13a8e4f xlib: strip out FX stuff 2009-01-08 15:05:08 +00:00
Keith Whitwell
18ad0e3a28 xlib: remove XFree86Server stuff 2009-01-08 15:00:27 +00:00
Keith Whitwell
2c8ffd70b7 xlib: remove realglx.[ch] 2009-01-08 14:55:52 +00:00
Keith Whitwell
002dfb12fc gallium: split driver-independent code out of xlib winsys
Place in new xlib state-tracker.  This is a statetracker for the GLX API.
2009-01-08 14:10:56 +00:00
José Fonseca
5cad143e54 glut: Unlist file.
Again..
2009-01-08 12:42:25 +00:00
José Fonseca
500e05d437 gdi: Add newline at end of file. 2009-01-08 12:42:00 +00:00
José Fonseca
ab3a9f1eed gallium: Replace uint64 by standard uint64_t.
uint64 is not (so?) standard, and often redefined by third parties,
causing name clashes.
2009-01-08 12:41:45 +00:00
José Fonseca
395edbc515 draw: Predeclare struct. 2009-01-08 12:31:36 +00:00
José Fonseca
a3ee0aa1bb Merge commit 'origin/gallium-0.1' into gallium-0.2
Conflicts:

	src/gallium/auxiliary/tgsi/tgsi_exec.c
	src/gallium/drivers/cell/spu/spu_command.h
	src/gallium/include/pipe/p_shader_tokens.h
	src/mesa/main/config.h
	src/mesa/main/mtypes.h
	src/mesa/shader/prog_execute.c
	src/mesa/shader/slang/slang_emit.c
	src/mesa/state_tracker/st_program.c
	src/mesa/state_tracker/wgl/stw_wgl.h
	src/mesa/state_tracker/wgl/stw_wgl_pixelformat.h
2009-01-08 12:31:14 +00:00
José Fonseca
2d3953fd5f mesa: Add _mesa_snprintf.
On Windows snprintf is renamed as _snprintf.
2009-01-08 12:06:07 +00:00
Brian Paul
b57797f3a8 mesa: fix GL_DEPTH_CLEAR_VALUE casting 2009-01-08 12:06:01 +00:00
Brian Paul
0f5c71afd9 mesa: fix float->int mapping for glGetIntegerv(GL_DEPTH_CLEAR_VALUE)
(cherry picked from commit 8124faf89d)

Conflicts:

	src/mesa/main/get.c
2009-01-08 12:05:33 +00:00
José Fonseca
a86776dba4 mesa: Move var declaration to top of scope. 2009-01-08 12:05:22 +00:00
José Fonseca
73d02d70b8 wgl: Do not provide DllMain inside the state tracker.
MS CRT libraries already provide a default DllMain entrypoint, and
MS Linker will complain if it finds the same symbol in two different
libraries. Therefore the DllMain has to be in (each) winsys.
2009-01-08 12:05:20 +00:00
José Fonseca
e59eb5fc96 gdi: Fix warning. 2009-01-08 12:05:17 +00:00
José Fonseca
19641a9295 wgl: Ensure public symbols get the proper DLL linkage attributes. 2009-01-08 12:05:14 +00:00
José Fonseca
8c0d8d89fa glut: Fix build. 2009-01-08 12:05:10 +00:00
José Fonseca
2105b61846 mesa: Ensure gl* symbols are marked as dllexport on windows. 2009-01-08 12:05:05 +00:00
José Fonseca
0db6804699 mesa: Use explicit casts when precision is lost.
Silences MSVC.
2009-01-08 12:04:59 +00:00
José Fonseca
ca337076b3 mesa: Fix windows build when UNICODE is defined. 2009-01-08 12:04:03 +00:00
José Fonseca
f8f9a1b620 mesa: Add _mesa_snprintf.
On Windows snprintf is renamed as _snprintf.
2009-01-07 12:02:06 +00:00
Brian Paul
a055520bfb add GL_READ_FRAMEBUFFER_BINDING_EXT case, regenerate get.c file
(cherry picked from commit 816fbeaa81)

Conflicts:

	src/mesa/main/get.c
2009-01-06 14:23:07 -07:00
Brian Paul
d14d494dcd mesa: fix GL_DEPTH_CLEAR_VALUE casting 2009-01-06 14:21:27 -07:00
Brian
c3be5e4a05 mesa: fix cast/conversion for optional code
(cherry picked from commit 1e3a44fab0)
2009-01-06 14:18:57 -07:00
Brian Paul
bec14ebf5e mesa: fix float->int mapping for glGetIntegerv(GL_DEPTH_CLEAR_VALUE)
(cherry picked from commit 8124faf89d)

Conflicts:

	src/mesa/main/get.c
2009-01-06 14:18:45 -07:00
Brian Paul
22ff5a7a0b mesa: pass ctx to link_uniform_vars() to fix build error 2009-01-06 14:04:17 -07:00
José Fonseca
3740a06e28 mesa: Move var declaration to top of scope. 2009-01-06 19:18:13 +00:00
José Fonseca
5da0401398 wgl: Do not provide DllMain inside the state tracker.
MS CRT libraries already provide a default DllMain entrypoint, and
MS Linker will complain if it finds the same symbol in two different
libraries. Therefore the DllMain has to be in (each) winsys.
2009-01-06 18:23:17 +00:00
José Fonseca
a40ad7ded4 gdi: Fix warning. 2009-01-06 18:23:16 +00:00
José Fonseca
c3ead57feb wgl: Ensure public symbols get the proper DLL linkage attributes. 2009-01-06 18:23:16 +00:00
José Fonseca
f98f553c4c glut: Fix build. 2009-01-06 18:23:16 +00:00
José Fonseca
3f46389a28 mesa: Ensure gl* symbols are marked as dllexport on windows. 2009-01-06 18:23:16 +00:00
José Fonseca
4ebb8f78e7 mesa: Use explicit casts when precision is lost.
Silences MSVC.
2009-01-06 18:23:16 +00:00
Brian Paul
fb45adeb9e mesa: fix a GLSL swizzled writemask bug
This fixes cases such as:
  vec4 v4;
  vec2 v2;
  v4.xz.yx = v2;
The last line now correctly compiles into MOV TEMP[1].xz, TEMP[0].yyxw;
Helps to fix the Humus Domino demo.  See bug 19189.

(cherry picked from commit 9736d8f033)
2009-01-06 09:22:32 -07:00
Brian Paul
0e25c363be mesa: fix warning about possibly undefined var in GLSL compiler
(cherry picked from commit 724ed5b84b)
2009-01-06 09:21:24 -07:00
Brian Paul
8e0b601e31 mesa: fix another "out of samplers" problem
Now only the samplers that are actually used by texture() functions are
saved in the uniform variable list.  Before, we could run out of samplers
if too many were declared while only some of them were actually used.

(cherry picked from commit 1fad6ccb75)

Conflicts:

	src/mesa/shader/slang/slang_link.c
2009-01-06 09:20:55 -07:00