← Back to branch summary

~ubuntu-branches/ubuntu/natty/mesa/natty-proposed

« back to all changes in this revision

Viewing changes to src/mapi/glapi/SConscript

  • Committer: Bazaar Package Importer
  • Author(s): Robert Hooker, Robert Hooker, Christopher James Halse Rogers
  • Date: 2010-09-14 08:55:40 UTC
  • mfrom: (1.2.28 upstream)
  • Revision ID: james.westby@ubuntu.com-20100914085540-m4fpl0hdjlfd4jgz
Tags: 7.9~git20100909-0ubuntu1
https://launchpad.net/bugs/631413
https://launchpad.net/bugs/628930
https://launchpad.net/bugs/628727
https://launchpad.net/bugs/596292
https://launchpad.net/bugs/599741
https://launchpad.net/bugs/630315
https://launchpad.net/bugs/613694
https://launchpad.net/bugs/599741
https://launchpad.net/bugs/578619
https://launchpad.net/bugs/626943
https://launchpad.net/bugs/610541
https://launchpad.net/bugs/601052
[ Robert Hooker ]
* New upstream git snapshot up to commit 94118fe2d4b1e5 (LP: #631413)
* New features include ATI HD5xxx series support in r600, and a vastly
  improved glsl compiler.
* Remove pre-generated .pc's, use the ones generated at build time
  instead.
* Remove all references to mesa-utils now that its no longer shipped
  with the mesa source.
* Disable the experimental ARB_fragment_shader option by default on
  i915, it exposes incomplete functionality that breaks KDE compositing
  among other things. It can be enabled via driconf still. (LP: #628930).

[ Christopher James Halse Rogers ]
* debian/patches/04_osmesa_version.diff:
  - Refresh for new upstream
* Bugs fixed in this release:
  - Fixes severe rendering corruption in Unity on radeon (LP: #628727,
    LP: #596292, LP: #599741, LP: #630315, LP: #613694, LP: #599741).
  - Also fixes rendering in gnome-shell (LP: #578619).
  - Flickering in OpenGL apps on radeon (LP: #626943, LP: #610541).
  - Provides preliminary support for new intel chips (LP: #601052).
* debian/rules:
  - Update configure flags to match upstream reshuffling.
  - Explicitly remove gallium DRI drivers that we don't want to ship.
* Update debian/gbp.conf for this Maverick-specific packaging
* libegl1-mesa-dri-x11,kms: There are no longer separate kms or x11 drivers
  for EGL, libegl1-mesa-drivers now contains a single driver that provides
  both backends.

Show diffs side-by-side

added added

removed removed

Lines of Context:
src/mapi/glapi/SConscript
 
1
#######################################################################
 
2
# SConscript for glapi
 
3
 
 
4
 
 
5
Import('*')
 
6
 
 
7
if env['platform'] != 'winddk':
 
8
 
 
9
        env = env.Clone()
 
10
        
 
11
        env.Append(CPPDEFINES = [
 
12
                'MAPI_GLAPI_CURRENT',
 
13
        ])
 
14
 
 
15
        if env['platform'] == 'windows':
 
16
                env.Append(CPPDEFINES = [
 
17
                        '_GDI32_', # prevent gl* being declared __declspec(dllimport) in MS headers
 
18
                        'BUILD_GL32', # declare gl* as __declspec(dllexport) in Mesa headers
 
19
                        'WIN32_THREADS', # use Win32 thread API
 
20
                ])
 
21
 
 
22
        env.Append(CPPPATH = [
 
23
                '#/src/mapi',
 
24
                '#/src/mesa',
 
25
        ])
 
26
        
 
27
        glapi_sources = [
 
28
                'glapi_dispatch.c',
 
29
                'glapi_entrypoint.c',
 
30
                'glapi_getproc.c',
 
31
                'glapi_nop.c',
 
32
                'glthread.c',
 
33
        ]
 
34
        
 
35
        mapi_sources = [
 
36
                'u_current.c',
 
37
                'u_execmem.c',
 
38
                'u_thread.c',
 
39
        ]
 
40
        for s in mapi_sources:
 
41
                o = env.SharedObject(s[:-2], '../mapi/' + s)
 
42
                glapi_sources.append(o)
 
43
 
 
44
        #
 
45
        # Assembly sources
 
46
        #
 
47
        if gcc and env['machine'] == 'x86':
 
48
                env.Append(CPPDEFINES = [
 
49
                        'USE_X86_ASM', 
 
50
                        'USE_MMX_ASM',
 
51
                        'USE_3DNOW_ASM',
 
52
                        'USE_SSE_ASM',
 
53
                ])
 
54
                glapi_sources += [
 
55
                        'glapi_x86.S',
 
56
                ]
 
57
        elif gcc and env['machine'] == 'x86_64':
 
58
                env.Append(CPPDEFINES = [
 
59
                        'USE_X86_64_ASM', 
 
60
                ])
 
61
                glapi_sources += [
 
62
                        'glapi_x86-64.S'
 
63
                ]
 
64
        elif gcc and env['machine'] == 'ppc':
 
65
                env.Append(CPPDEFINES = [
 
66
                        'USE_PPC_ASM', 
 
67
                        'USE_VMX_ASM', 
 
68
                ])
 
69
                glapi_sources += [
 
70
                ]
 
71
        elif gcc and env['machine'] == 'sparc':
 
72
                glapi_sources += [
 
73
                        'glapi_sparc.S'
 
74
                ]
 
75
        else:
 
76
                pass
 
77
        
 
78
        glapi = env.ConvenienceLibrary(
 
79
                target = 'glapi',
 
80
                source = glapi_sources,
 
81
        )
 
82
        Export('glapi')