gpu/command_buffer/service/texture_definition.h - Issue 1505343003: Updating texture validation to account for sampler objects in ES3

Side by Side Diff

Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.

Keyboard Shortcuts

	File
u :	up to issue
j / k :	jump to file after / before current file
J / K :	jump to next file with a comment after / before current file
	Side-by-side diff
i :	toggle intra-line diffs
e :	expand all comments
c :	collapse all comments
s :	toggle showing all comments
n / p :	next / previous diff chunk or comment
N / P :	next / previous comment
<Up> / <Down> :	next / previous line

	Issue
u :	up to list of issues
j / k :	jump to patch after / before current patch
o / <Enter> :	open current patch in side-by-side view
i :	open current patch in unified diff view

	Issue List
j / k :	jump to issue after / before current issue
o / <Enter> :	open current issue

Side by Side Diff: gpu/command_buffer/service/texture_definition.h

Issue 1505343003: Updating texture validation to account for sampler objects in ES3 (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master

Patch Set: Fixed DCHECK that was causing bots to fail Created 5 years 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 | « gpu/command_buffer/service/sampler_manager.cc ('k') | gpu/command_buffer/service/texture_definition.cc » ('j') | gpu/command_buffer/service/texture_manager.cc » ('J')
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

OLD	NEW
1 // Copyright 2014 The Chromium Authors. All rights reserved.	1 // Copyright 2014 The Chromium 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 #ifndef GPU_COMMAND_BUFFER_SERVICE_TEXTURE_DEFINITION_H_	5 #ifndef GPU_COMMAND_BUFFER_SERVICE_TEXTURE_DEFINITION_H_

6 #define GPU_COMMAND_BUFFER_SERVICE_TEXTURE_DEFINITION_H_	6 #define GPU_COMMAND_BUFFER_SERVICE_TEXTURE_DEFINITION_H_

7	7

8 #include <vector>	8 #include <vector>

9	9

10 #include "base/memory/ref_counted.h"	10 #include "base/memory/ref_counted.h"

(...skipping 81 matching lines...) Expand 10 before \| Expand all \| Expand 10 after Loading...
92 unsigned int version_;	92 unsigned int version_;

93 GLenum target_;	93 GLenum target_;

94 scoped_refptr<NativeImageBuffer> image_buffer_;	94 scoped_refptr<NativeImageBuffer> image_buffer_;

95 GLenum min_filter_;	95 GLenum min_filter_;

96 GLenum mag_filter_;	96 GLenum mag_filter_;

97 GLenum wrap_s_;	97 GLenum wrap_s_;

98 GLenum wrap_t_;	98 GLenum wrap_t_;

99 GLenum usage_;	99 GLenum usage_;

100 bool immutable_;	100 bool immutable_;

101 bool defined_;	101 bool defined_;

	102 bool is_es3_enabled_;

102	103

103 // Only support textures with one face and one level.	104 // Only support textures with one face and one level.

104 LevelInfo level_info_;	105 LevelInfo level_info_;

105 };	106 };

106	107

107 } // namespage gles2	108 } // namespage gles2

108 } // namespace gpu	109 } // namespace gpu

109	110

110 #endif // GPU_COMMAND_BUFFER_SERVICE_TEXTURE_DEFINITION_H_	111 #endif // GPU_COMMAND_BUFFER_SERVICE_TEXTURE_DEFINITION_H_

OLD	NEW