~kgunn72/mir/dont-crash-when-shooting-invalid-surface

« back to all changes in this revision

Viewing changes to src/platform/graphics/mesa/internal_native_display.h

  • Committer: Tarmac
  • Author(s): Alan Griffiths, Alexandros Frantzis, Daniel van Vugt, Kevin DuBois, Christopher James Halse Rogers, chris.gagnon, Mathieu Trudel-Lapierre, Robert Carr, Automatic PS uploader, Kevin Gunn, Daniel d'Andrada, Christopher James Halse Rogers, Michael Terry, Brandon Schaefer, Timo Jyrinki, Mir Team, Andreas Pokorny
  • Date: 2013-12-20 11:11:22 UTC
  • mfrom: (1169.1.1 version-0.1.3)
  • Revision ID: tarmac-20131220111122-h503fd1fnq7pn9za
Latest upstream release: Mir 0.1.3 (r1298).

Approved by Alan Griffiths, PS Jenkins bot.

Show diffs side-by-side

added added

removed removed

Lines of Context:
2
2
 * Copyright © 2013 Canonical Ltd.
3
3
 *
4
4
 * This program is free software: you can redistribute it and/or modify it
5
 
 * under the terms of the GNU General Public License version 3,
 
5
 * under the terms of the GNU Lesser General Public License version 3,
6
6
 * as published by the Free Software Foundation.
7
7
 *
8
8
 * This program is distributed in the hope that it will be useful,
9
9
 * but WITHOUT ANY WARRANTY; without even the implied warranty of
10
10
 * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
11
 
 * GNU General Public License for more details.
 
11
 * GNU Lesser General Public License for more details.
12
12
 *
13
 
 * You should have received a copy of the GNU General Public License
 
13
 * You should have received a copy of the GNU Lesser General Public License
14
14
 * along with this program. If not, see <http://www.gnu.org/licenses/>.
15
15
 *
16
16
 * Authored by: Robert Carr <robert.carr@canonical.com>
17
17
 *              Kevin DuBois <kevin.dubois@canonical.com>
18
18
 */
19
19
 
20
 
#ifndef MIR_GRAPHICS_GBM_INTERNAL_NATIVE_DISPLAY_H_
21
 
#define MIR_GRAPHICS_GBM_INTERNAL_NATIVE_DISPLAY_H_
 
20
#ifndef MIR_GRAPHICS_MESA_INTERNAL_NATIVE_DISPLAY_H_
 
21
#define MIR_GRAPHICS_MESA_INTERNAL_NATIVE_DISPLAY_H_
22
22
 
23
23
#include "mir_toolkit/mesa/native_display.h"
24
24
#include <memory>
28
28
namespace graphics
29
29
{
30
30
struct PlatformIPCPackage;
31
 
namespace gbm
 
31
namespace mesa
32
32
{
33
33
 
34
34
class InternalNativeDisplay : public MirMesaEGLNativeDisplay
45
45
}
46
46
}
47
47
}
48
 
#endif /* MIR_GRAPHICS_GBM_INTERNAL_NATIVE_DISPLAY_H_ */
 
48
#endif /* MIR_GRAPHICS_MESA_INTERNAL_NATIVE_DISPLAY_H_ */