projects
/
mesa.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
mesa: Return after ScissorArrayv or ScissorIndexed detect a parameter error
[mesa.git]
/
src
/
mesa
/
SConscript
diff --git
a/src/mesa/SConscript
b/src/mesa/SConscript
index d328fc13c48d1a954b6b28d4c9308d37d18bba2c..77e2aaa7ee1cdb1dfa8633fd0c8c999089449b82 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
@@
-94,8
+91,10
@@
main_sources = [
'main/mipmap.c',
'main/mm.c',
'main/multisample.c',
'main/mipmap.c',
'main/mm.c',
'main/multisample.c',
+ 'main/objectlabel.c',
'main/pack.c',
'main/pbo.c',
'main/pack.c',
'main/pbo.c',
+ 'main/performance_monitor.c',
'main/pixel.c',
'main/pixelstore.c',
'main/pixeltransfer.c',
'main/pixel.c',
'main/pixelstore.c',
'main/pixeltransfer.c',
@@
-111,6
+110,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',
@@
-134,10
+134,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',
@@
-285,6
+287,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_"')
@@
-336,10
+339,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',