| OLD | NEW |
| 1 // Copyright (c) 2009 The Chromium Authors. All rights reserved. | 1 // Copyright (c) 2009 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 // This file contains the GLES2Decoder class. | 5 // This file contains the GLES2Decoder class. |
| 6 | 6 |
| 7 #ifndef GPU_COMMAND_BUFFER_SERVICE_GLES2_CMD_DECODER_H_ | 7 #ifndef GPU_COMMAND_BUFFER_SERVICE_GLES2_CMD_DECODER_H_ |
| 8 #define GPU_COMMAND_BUFFER_SERVICE_GLES2_CMD_DECODER_H_ | 8 #define GPU_COMMAND_BUFFER_SERVICE_GLES2_CMD_DECODER_H_ |
| 9 | 9 |
| 10 #include <build/build_config.h> | 10 #include <build/build_config.h> |
| 11 #if defined(OS_LINUX) | 11 #if defined(OS_WIN) |
| 12 #include "gpu/command_buffer/service/x_utils.h" | |
| 13 #elif defined(OS_WIN) | |
| 14 #include <windows.h> | 12 #include <windows.h> |
| 15 #endif | 13 #endif |
| 16 #include "gpu/command_buffer/service/common_decoder.h" | 14 #include "gpu/command_buffer/service/common_decoder.h" |
| 17 | 15 |
| 18 namespace gpu { | 16 namespace gpu { |
| 17 // Forward-declared instead of including x_utils.h, because including glx.h |
| 18 // causes havok. |
| 19 class XWindowWrapper; |
| 20 |
| 19 namespace gles2 { | 21 namespace gles2 { |
| 20 | 22 |
| 21 // This class implements the AsyncAPIInterface interface, decoding GLES2 | 23 // This class implements the AsyncAPIInterface interface, decoding GLES2 |
| 22 // commands and calling GL. | 24 // commands and calling GL. |
| 23 class GLES2Decoder : public CommonDecoder { | 25 class GLES2Decoder : public CommonDecoder { |
| 24 public: | 26 public: |
| 25 typedef parse_error::ParseError ParseError; | 27 typedef parse_error::ParseError ParseError; |
| 26 | 28 |
| 27 // Creates a decoder. | 29 // Creates a decoder. |
| 28 static GLES2Decoder* Create(); | 30 static GLES2Decoder* Create(); |
| (...skipping 47 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 76 HWND hwnd_; | 78 HWND hwnd_; |
| 77 #endif | 79 #endif |
| 78 | 80 |
| 79 DISALLOW_COPY_AND_ASSIGN(GLES2Decoder); | 81 DISALLOW_COPY_AND_ASSIGN(GLES2Decoder); |
| 80 }; | 82 }; |
| 81 | 83 |
| 82 } // namespace gles2 | 84 } // namespace gles2 |
| 83 } // namespace gpu | 85 } // namespace gpu |
| 84 | 86 |
| 85 #endif // GPU_COMMAND_BUFFER_SERVICE_GLES2_CMD_DECODER_H_ | 87 #endif // GPU_COMMAND_BUFFER_SERVICE_GLES2_CMD_DECODER_H_ |
| OLD | NEW |