Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(239)

Side by Side Diff: client/deps/glbench/src/Makefile

Issue 1315007: Added tearing tests for plain texture updates and bind pixmap to texture. (Closed)
Patch Set: Created 10 years, 9 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View unified diff | Download patch
« no previous file with comments | « no previous file | client/deps/glbench/src/glx_stuff.h » ('j') | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
1 # Copyright (c) 2010 The Chromium OS Authors. All rights reserved. 1 # Copyright (c) 2010 The Chromium OS Authors. All rights reserved.
2 # Use of this source code is governed by a BSD-style license that can be 2 # Use of this source code is governed by a BSD-style license that can be
3 # found in the LICENSE file. 3 # found in the LICENSE file.
4 4
5 SOURCES_COMMON = xlib_window.cc utils.cc 5 SOURCES_COMMON = xlib_window.cc utils.cc
6 SOURCES_GL_BENCH = main.cc bench.cc shaders.cc 6 SOURCES_GL_BENCH = main.cc bench.cc shaders.cc
7 SOURCES_TEARTEST = teartest.cc 7 SOURCES_TEARTEST = teartest.cc
8 SOURCES_ALL = $(SOURCES_COMMON) $(SOURCES_GL_BENCH) $(SOURCES_TEARTEST) 8 SOURCES_ALL = $(SOURCES_COMMON) $(SOURCES_GL_BENCH) $(SOURCES_TEARTEST)
9 9
10 CXXFLAGS = -g -Wall -Werror -I$(GCLIENT_ROOT)/src/third_party/chrome/files 10 CXXFLAGS = -g -Wall -Werror -I$(GCLIENT_ROOT)/src/third_party/chrome/files
11 LDFLAGS = -lGL -lX11 -L$(GCLIENT_ROOT)/src/third_party/chrome -lbase -lrt 11 LDFLAGS = -lGL -lX11 -L$(GCLIENT_ROOT)/src/third_party/chrome -lbase -lrt
12 GL_BENCH = ../glbench 12 GL_BENCH = ../glbench
13 TEARTEST = ../teartest 13 TEARTEST = ../teartest
14 14
15 GCLIENT_ROOT ?= ../../../../../../../.. 15 GCLIENT_ROOT ?= ../../../../../../../..
16 16
17 ifdef USE_EGL 17 ifdef USE_EGL
18 CXXFLAGS += -I$(GCLIENT_ROOT)/src/third_party/khronos/files/include 18 CXXFLAGS += -I$(GCLIENT_ROOT)/src/third_party/khronos/files/include
19 SOURCES_COMMON += egl_stuff.cc 19 SOURCES_COMMON += egl_stuff.cc
20 SOURCES_TEARTEST += teartest_egl.cc
20 LDFLAGS += -L$(GCLIENT_ROOT)/src/third_party/khronos/files -lEGL 21 LDFLAGS += -L$(GCLIENT_ROOT)/src/third_party/khronos/files -lEGL
21 else 22 else
22 SOURCES_COMMON += glx_stuff.cc 23 SOURCES_COMMON += glx_stuff.cc
24 SOURCES_TEARTEST += teartest_glx.cc
23 endif 25 endif
24 26
25 OBJS_COMMON = $(SOURCES_COMMON:.cc=.o) 27 OBJS_COMMON = $(SOURCES_COMMON:.cc=.o)
26 OBJS_GL_BENCH = $(SOURCES_GL_BENCH:.cc=.o) 28 OBJS_GL_BENCH = $(SOURCES_GL_BENCH:.cc=.o)
27 OBJS_TEARTEST = $(SOURCES_TEARTEST:.cc=.o) 29 OBJS_TEARTEST = $(SOURCES_TEARTEST:.cc=.o)
28 OBJS_ALL = $(SOURCES_ALL:.cc=.o) 30 OBJS_ALL = $(SOURCES_ALL:.cc=.o)
29 DEPS_ALL = $(SOURCES_ALL:.cc=.d) 31 DEPS_ALL = $(SOURCES_ALL:.cc=.d)
30 32
31 .PHONY: all clean 33 .PHONY: all clean
32 34
33 all: $(GL_BENCH) $(TEARTEST) 35 all: $(GL_BENCH) $(TEARTEST)
34 36
35 $(TEARTEST): $(OBJS_COMMON) $(OBJS_TEARTEST) 37 $(TEARTEST): $(OBJS_COMMON) $(OBJS_TEARTEST)
36 $(GL_BENCH): $(OBJS_COMMON) $(OBJS_GL_BENCH) 38 $(GL_BENCH): $(OBJS_COMMON) $(OBJS_GL_BENCH)
37 39
38 clean: 40 clean:
39 $(RM) $(GL_BENCH) $(TEARTEST) $(OBJS_ALL) $(DEPS_ALL) 41 $(RM) $(GL_BENCH) $(TEARTEST) $(OBJS_ALL) $(DEPS_ALL)
40 42
41 $(GL_BENCH) $(TEARTEST): 43 $(GL_BENCH) $(TEARTEST):
42 $(CXX) $^ -o $@ $(CXXFLAGS) $(LDFLAGS) 44 $(CXX) $^ -o $@ $(CXXFLAGS) $(LDFLAGS)
43 45
44 $(OBJS_ALL): %.o: %.cc 46 $(OBJS_ALL): %.o: %.cc
45 $(CXX) $(CXXFLAGS) -c $< -o $@ -MMD 47 $(CXX) $(CXXFLAGS) -c $< -o $@ -MMD
46 48
47 -include $(DEPS_ALL) 49 -include $(DEPS_ALL)
OLDNEW
« no previous file with comments | « no previous file | client/deps/glbench/src/glx_stuff.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698