projects
/
mesa.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
i965: Drop the memcmp for finding duplicated CURBE uploads.
[mesa.git]
/
src
/
mesa
/
SConscript
diff --git
a/src/mesa/SConscript
b/src/mesa/SConscript
index 2cdb79c46b106749bef1e12c18f810f027a7b206..f56578672a640b289687e7b4fe4d8650fb77bcde 100644
(file)
--- a/
src/mesa/SConscript
+++ b/
src/mesa/SConscript
@@
-18,9
+18,6
@@
env.Append(CPPPATH = [
Dir('.'), # src/mesa build path
])
Dir('.'), # src/mesa build path
])
-enabled_apis = []
-enabled_apis += ['GL']
-
if env['platform'] == 'windows':
env.Append(CPPDEFINES = [
'_GDI32_', # prevent gl* being declared __declspec(dllimport) in MS headers
if env['platform'] == 'windows':
env.Append(CPPDEFINES = [
'_GDI32_', # prevent gl* being declared __declspec(dllimport) in MS headers
@@
-49,11
+46,13
@@
main_sources = [
'main/attrib.c',
'main/arrayobj.c',
'main/blend.c',
'main/attrib.c',
'main/arrayobj.c',
'main/blend.c',
+ 'main/blit.c',
'main/bufferobj.c',
'main/buffers.c',
'main/clear.c',
'main/clip.c',
'main/colortab.c',
'main/bufferobj.c',
'main/buffers.c',
'main/clear.c',
'main/clip.c',
'main/colortab.c',
+ 'main/compute.c',
'main/condrender.c',
'main/context.c',
'main/convolve.c',
'main/condrender.c',
'main/context.c',
'main/convolve.c',
@@
-80,6
+79,7
@@
main_sources = [
'main/format_pack.c',
'main/format_unpack.c',
'main/framebuffer.c',
'main/format_pack.c',
'main/format_unpack.c',
'main/framebuffer.c',
+ 'main/genmipmap.c',
'main/getstring.c',
'main/glformats.c',
'main/hash.c',
'main/getstring.c',
'main/glformats.c',
'main/hash.c',
@@
-97,6
+97,8
@@
main_sources = [
'main/objectlabel.c',
'main/pack.c',
'main/pbo.c',
'main/objectlabel.c',
'main/pack.c',
'main/pbo.c',
+ 'main/performance_monitor.c',
+ 'main/pipelineobj.c',
'main/pixel.c',
'main/pixelstore.c',
'main/pixeltransfer.c',
'main/pixel.c',
'main/pixelstore.c',
'main/pixeltransfer.c',
@@
-112,6
+114,7
@@
main_sources = [
'main/scissor.c',
'main/set.c',
'main/shaderapi.c',
'main/scissor.c',
'main/set.c',
'main/shaderapi.c',
+ 'main/shaderimage.c',
'main/shaderobj.c',
'main/shader_query.cpp',
'main/shared.c',
'main/shaderobj.c',
'main/shader_query.cpp',
'main/shared.c',
@@
-135,10
+138,12
@@
main_sources = [
'main/texstorage.c',
'main/texstore.c',
'main/texturebarrier.c',
'main/texstorage.c',
'main/texstore.c',
'main/texturebarrier.c',
+ 'main/textureview.c',
'main/transformfeedback.c',
'main/uniform_query.cpp',
'main/uniforms.c',
'main/varray.c',
'main/transformfeedback.c',
'main/uniform_query.cpp',
'main/uniforms.c',
'main/varray.c',
+ 'main/vdpau.c',
'main/version.c',
'main/viewport.c',
'main/vtxfmt.c',
'main/version.c',
'main/viewport.c',
'main/vtxfmt.c',
@@
-286,6
+291,7
@@
statetracker_sources = [
'state_tracker/st_mesa_to_tgsi.c',
'state_tracker/st_program.c',
'state_tracker/st_texture.c',
'state_tracker/st_mesa_to_tgsi.c',
'state_tracker/st_program.c',
'state_tracker/st_texture.c',
+ 'state_tracker/st_vdpau.c',
]
env.Append(YACCFLAGS = '-d -p "_mesa_program_"')
]
env.Append(YACCFLAGS = '-d -p "_mesa_program_"')
@@
-320,6
+326,8
@@
program_sources = [
common_driver_sources = [
'drivers/common/driverfuncs.c',
'drivers/common/meta.c',
common_driver_sources = [
'drivers/common/driverfuncs.c',
'drivers/common/meta.c',
+ 'drivers/common/meta_blit.c',
+ 'drivers/common/meta_generate_mipmap.c'
]
mesa_sources = (
]
mesa_sources = (
@@
-337,10
+345,6
@@
mesa_sources = (
GLAPI = '#src/mapi/glapi/'
GLAPI = '#src/mapi/glapi/'
-if env['gles']:
-
- enabled_apis += ['ES1', 'ES2']
-
get_hash_header = env.CodeGenerate(
target = 'main/get_hash.h',
script = 'main/get_hash_generator.py',
get_hash_header = env.CodeGenerate(
target = 'main/get_hash.h',
script = 'main/get_hash_generator.py',
@@
-388,6
+392,7
@@
if (env['gcc'] or env['clang']) and \
'USE_X86_64_ASM',
])
mesa_sources += [
'USE_X86_64_ASM',
])
mesa_sources += [
+ 'x86/common_x86.c',
'x86-64/x86-64.c',
'x86-64/xform4.S',
]
'x86-64/x86-64.c',
'x86-64/xform4.S',
]